Merge "Tuner API: set default values of FrontendSettings" into rvc-dev am: 9a6e5241eb (da515c52) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -215,14 +215,16 @@ public class AnalogFrontendSettings extends FrontendSettings {
		* Builder for {@link AnalogFrontendSettings}.
		*/
		public static class Builder {
		private int mFrequency;
		private int mSignalType;
		private int mSifStandard;
		private int mFrequency = 0;
		private int mSignalType = SIGNAL_TYPE_UNDEFINED;
		private int mSifStandard = SIF_UNDEFINED;

		private Builder() {}

		/**
		* Sets frequency in Hz.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		@IntRange(from = 1)
		@@ -233,6 +235,8 @@ public class AnalogFrontendSettings extends FrontendSettings {

		/**
		* Sets analog signal type.
		*
		* <p>Default value is {@link #SIGNAL_TYPE_UNDEFINED}.
		*/
		@NonNull
		public Builder setSignalType(@SignalType int signalType) {
		@@ -242,6 +246,8 @@ public class AnalogFrontendSettings extends FrontendSettings {

		/**
		* Sets Standard Interchange Format (SIF).
		*
		* <p>Default value is {@link #SIF_UNDEFINED}.
		*/
		@NonNull
		public Builder setSifStandard(@SifStandard int sifStandard) {

media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java

+12 −4

Original line number	Diff line number	Diff line
		@@ -327,16 +327,18 @@ public class Atsc3FrontendSettings extends FrontendSettings {
		* Builder for {@link Atsc3FrontendSettings}.
		*/
		public static class Builder {
		private int mFrequency;
		private int mBandwidth;
		private int mDemodOutputFormat;
		private Atsc3PlpSettings[] mPlpSettings;
		private int mFrequency = 0;
		private int mBandwidth = BANDWIDTH_UNDEFINED;
		private int mDemodOutputFormat = DEMOD_OUTPUT_FORMAT_UNDEFINED;
		private Atsc3PlpSettings[] mPlpSettings = {};

		private Builder() {
		}

		/**
		* Sets frequency in Hz.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		@IntRange(from = 1)
		@@ -347,6 +349,8 @@ public class Atsc3FrontendSettings extends FrontendSettings {

		/**
		* Sets bandwidth.
		*
		* <p>Default value is {@link #BANDWIDTH_UNDEFINED}.
		*/
		@NonNull
		public Builder setBandwidth(int bandwidth) {
		@@ -355,6 +359,8 @@ public class Atsc3FrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Demod Output Format.
		*
		* <p>Default value is {@link #DEMOD_OUTPUT_FORMAT_UNDEFINED}.
		*/
		@NonNull
		public Builder setDemodOutputFormat(@DemodOutputFormat int demodOutputFormat) {
		@@ -363,6 +369,8 @@ public class Atsc3FrontendSettings extends FrontendSettings {
		}
		/**
		* Sets PLP Settings.
		*
		* <p>Default value an empty array.
		*/
		@NonNull
		public Builder setPlpSettings(@NonNull Atsc3PlpSettings[] plpSettings) {

media/java/android/media/tv/tuner/frontend/AtscFrontendSettings.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -93,14 +93,16 @@ public class AtscFrontendSettings extends FrontendSettings {
		* Builder for {@link AtscFrontendSettings}.
		*/
		public static class Builder {
		private int mFrequency;
		private int mModulation;
		private int mFrequency = 0;
		private int mModulation = MODULATION_UNDEFINED;

		private Builder() {
		}

		/**
		* Sets frequency in Hz.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		@IntRange(from = 1)
		@@ -111,6 +113,8 @@ public class AtscFrontendSettings extends FrontendSettings {

		/**
		* Sets Modulation.
		*
		* <p>Default value is {@link #MODULATION_UNDEFINED}.
		*/
		@NonNull
		public Builder setModulation(@Modulation int modulation) {

media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -220,19 +220,21 @@ public class DvbcFrontendSettings extends FrontendSettings {
		* Builder for {@link DvbcFrontendSettings}.
		*/
		public static class Builder {
		private int mFrequency;
		private int mModulation;
		private long mInnerFec;
		private int mSymbolRate;
		private int mOuterFec;
		private int mAnnex;
		private int mSpectralInversion;
		private int mFrequency = 0;
		private int mModulation = MODULATION_UNDEFINED;
		private long mInnerFec = FEC_UNDEFINED;
		private int mSymbolRate = 0;
		private int mOuterFec = OUTER_FEC_UNDEFINED;
		private int mAnnex = ANNEX_UNDEFINED;
		private int mSpectralInversion = SPECTRAL_INVERSION_UNDEFINED;

		private Builder() {
		}

		/**
		* Sets frequency in Hz.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		@IntRange(from = 1)
		@@ -243,6 +245,8 @@ public class DvbcFrontendSettings extends FrontendSettings {

		/**
		* Sets Modulation.
		*
		* <p>Default value is {@link #MODULATION_UNDEFINED}.
		*/
		@NonNull
		public Builder setModulation(@Modulation int modulation) {
		@@ -251,6 +255,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Inner Forward Error Correction.
		*
		* <p>Default value is {@link #FEC_UNDEFINED}.
		*/
		@NonNull
		public Builder setInnerFec(@InnerFec long fec) {
		@@ -259,6 +265,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Symbol Rate in symbols per second.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		public Builder setSymbolRate(int symbolRate) {
		@@ -267,6 +275,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Outer Forward Error Correction.
		*
		* <p>Default value is {@link #OUTER_FEC_UNDEFINED}.
		*/
		@NonNull
		public Builder setOuterFec(@OuterFec int outerFec) {
		@@ -275,6 +285,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Annex.
		*
		* <p>Default value is {@link #ANNEX_UNDEFINED}.
		*/
		@NonNull
		public Builder setAnnex(@Annex int annex) {
		@@ -283,6 +295,8 @@ public class DvbcFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Spectral Inversion.
		*
		* <p>Default value is {@link #SPECTRAL_INVERSION_UNDEFINED}.
		*/
		@NonNull
		public Builder setSpectralInversion(@SpectralInversion int spectralInversion) {

media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java

+28 −9

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.annotation.RequiresPermission;
		import android.annotation.SystemApi;
		import android.content.Context;
		import android.hardware.tv.tuner.V1_0.Constants;
		import android.media.tv.tuner.Tuner;
		import android.media.tv.tuner.TunerUtils;

		import java.lang.annotation.Retention;
		@@ -305,21 +306,23 @@ public class DvbsFrontendSettings extends FrontendSettings {
		* Builder for {@link DvbsFrontendSettings}.
		*/
		public static class Builder {
		private int mFrequency;
		private int mModulation;
		private DvbsCodeRate mCodeRate;
		private int mSymbolRate;
		private int mRolloff;
		private int mPilot;
		private int mInputStreamId;
		private int mStandard;
		private int mVcmMode;
		private int mFrequency = 0;
		private int mModulation = MODULATION_UNDEFINED;
		private DvbsCodeRate mCodeRate = null;
		private int mSymbolRate = 0;
		private int mRolloff = ROLLOFF_UNDEFINED;
		private int mPilot = PILOT_UNDEFINED;
		private int mInputStreamId = Tuner.INVALID_STREAM_ID;
		private int mStandard = STANDARD_AUTO;
		private int mVcmMode = VCM_MODE_UNDEFINED;

		private Builder() {
		}

		/**
		* Sets frequency in Hz.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		@IntRange(from = 1)
		@@ -330,6 +333,8 @@ public class DvbsFrontendSettings extends FrontendSettings {

		/**
		* Sets Modulation.
		*
		* <p>Default value is {@link #MODULATION_UNDEFINED}.
		*/
		@NonNull
		public Builder setModulation(@Modulation int modulation) {
		@@ -338,6 +343,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Code rate.
		*
		* <p>Default value is {@code null}.
		*/
		@NonNull
		public Builder setCodeRate(@Nullable DvbsCodeRate codeRate) {
		@@ -346,6 +353,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Symbol Rate.
		*
		* <p>Default value is 0.
		*/
		@NonNull
		public Builder setSymbolRate(int symbolRate) {
		@@ -354,6 +363,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Rolloff.
		*
		* <p>Default value is {@link #ROLLOFF_UNDEFINED}.
		*/
		@NonNull
		public Builder setRolloff(@Rolloff int rolloff) {
		@@ -362,6 +373,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Pilot mode.
		*
		* <p>Default value is {@link #PILOT_UNDEFINED}.
		*/
		@NonNull
		public Builder setPilot(@Pilot int pilot) {
		@@ -370,6 +383,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Input Stream ID.
		*
		* <p>Default value is {@link Tuner#INVALID_STREAM_ID}.
		*/
		@NonNull
		public Builder setInputStreamId(int inputStreamId) {
		@@ -378,6 +393,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets Standard.
		*
		* <p>Default value is {@link #STANDARD_AUTO}.
		*/
		@NonNull
		public Builder setStandard(@Standard int standard) {
		@@ -386,6 +403,8 @@ public class DvbsFrontendSettings extends FrontendSettings {
		}
		/**
		* Sets VCM mode.
		*
		* <p>Default value is {@link #VCM_MODE_UNDEFINED}.
		*/
		@NonNull
		public Builder setVcmMode(@VcmMode int vcm) {