Merge "Complete FilterConfiguration part 1" (9425736b) · Commits · e / os / android_frameworks_base

media/java/android/media/tv/tuner/Tuner.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,12 +23,12 @@ import android.annotation.SystemApi;
		import android.content.Context;
		import android.media.tv.tuner.TunerConstants.FilterStatus;
		import android.media.tv.tuner.TunerConstants.FilterSubtype;
		import android.media.tv.tuner.TunerConstants.FilterType;
		import android.media.tv.tuner.TunerConstants.FrontendScanType;
		import android.media.tv.tuner.TunerConstants.LnbPosition;
		import android.media.tv.tuner.TunerConstants.LnbTone;
		import android.media.tv.tuner.TunerConstants.LnbVoltage;
		import android.media.tv.tuner.TunerConstants.Result;
		import android.media.tv.tuner.filter.FilterConfiguration.FilterType;
		import android.media.tv.tuner.filter.FilterEvent;
		import android.media.tv.tuner.frontend.FrontendCallback;
		import android.media.tv.tuner.frontend.FrontendInfo;

media/java/android/media/tv/tuner/TunerConstants.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -127,21 +127,6 @@ public final class TunerConstants {
		/** @hide */
		public static final int FRONTEND_SETTINGS_ISDBT = 9;

		/** @hide */
		@IntDef({FILTER_TYPE_TS, FILTER_TYPE_MMTP, FILTER_TYPE_IP, FILTER_TYPE_TLV, FILTER_TYPE_ALP})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FilterType {}
		/** @hide */
		public static final int FILTER_TYPE_TS = Constants.DemuxFilterMainType.TS;
		/** @hide */
		public static final int FILTER_TYPE_MMTP = Constants.DemuxFilterMainType.MMTP;
		/** @hide */
		public static final int FILTER_TYPE_IP = Constants.DemuxFilterMainType.IP;
		/** @hide */
		public static final int FILTER_TYPE_TLV = Constants.DemuxFilterMainType.TLV;
		/** @hide */
		public static final int FILTER_TYPE_ALP = Constants.DemuxFilterMainType.ALP;

		/** @hide */
		@IntDef({FILTER_SUBTYPE_UNDEFINED, FILTER_SUBTYPE_SECTION, FILTER_SUBTYPE_PES,
		FILTER_SUBTYPE_AUDIO, FILTER_SUBTYPE_VIDEO, FILTER_SUBTYPE_DOWNLOAD,

media/java/android/media/tv/tuner/TunerUtils.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -20,7 +20,8 @@ import android.content.Context;
		import android.content.pm.PackageManager;
		import android.hardware.tv.tuner.V1_0.Constants;
		import android.media.tv.tuner.TunerConstants.FilterSubtype;
		import android.media.tv.tuner.TunerConstants.FilterType;
		import android.media.tv.tuner.filter.FilterConfiguration;
		import android.media.tv.tuner.filter.FilterConfiguration.FilterType;

		/**
		* Utility class for tuner framework.
		@@ -50,7 +51,7 @@ public final class TunerUtils {
		* @param subtype filter subtype.
		*/
		public static int getFilterSubtype(@FilterType int mainType, @FilterSubtype int subtype) {
		if (mainType == TunerConstants.FILTER_TYPE_TS) {
		if (mainType == FilterConfiguration.FILTER_TYPE_TS) {
		switch (subtype) {
		case TunerConstants.FILTER_SUBTYPE_UNDEFINED:
		return Constants.DemuxTsFilterType.UNDEFINED;
		@@ -73,7 +74,7 @@ public final class TunerUtils {
		default:
		break;
		}
		} else if (mainType == TunerConstants.FILTER_TYPE_MMTP) {
		} else if (mainType == FilterConfiguration.FILTER_TYPE_MMTP) {
		switch (subtype) {
		case TunerConstants.FILTER_SUBTYPE_UNDEFINED:
		return Constants.DemuxMmtpFilterType.UNDEFINED;
		@@ -95,7 +96,7 @@ public final class TunerUtils {
		break;
		}

		} else if (mainType == TunerConstants.FILTER_TYPE_IP) {
		} else if (mainType == FilterConfiguration.FILTER_TYPE_IP) {
		switch (subtype) {
		case TunerConstants.FILTER_SUBTYPE_UNDEFINED:
		return Constants.DemuxIpFilterType.UNDEFINED;
		@@ -112,7 +113,7 @@ public final class TunerUtils {
		default:
		break;
		}
		} else if (mainType == TunerConstants.FILTER_TYPE_TLV) {
		} else if (mainType == FilterConfiguration.FILTER_TYPE_TLV) {
		switch (subtype) {
		case TunerConstants.FILTER_SUBTYPE_UNDEFINED:
		return Constants.DemuxTlvFilterType.UNDEFINED;
		@@ -125,7 +126,7 @@ public final class TunerUtils {
		default:
		break;
		}
		} else if (mainType == TunerConstants.FILTER_TYPE_ALP) {
		} else if (mainType == FilterConfiguration.FILTER_TYPE_ALP) {
		switch (subtype) {
		case TunerConstants.FILTER_SUBTYPE_UNDEFINED:
		return Constants.DemuxAlpFilterType.UNDEFINED;

media/java/android/media/tv/tuner/filter/AlpFilterConfiguration.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -16,8 +16,6 @@

		package android.media.tv.tuner.filter;

		import android.media.tv.tuner.TunerConstants;

		/**
		* Filter configuration for a ALP filter.
		* @hide
		@@ -32,6 +30,6 @@ public class AlpFilterConfiguration extends FilterConfiguration {

		@Override
		public int getType() {
		return TunerConstants.FILTER_TYPE_ALP;
		return FilterConfiguration.FILTER_TYPE_ALP;
		}
		}

media/java/android/media/tv/tuner/filter/FilterConfiguration.java

+39 −5

Original line number	Diff line number	Diff line
		@@ -16,28 +16,62 @@

		package android.media.tv.tuner.filter;

		import android.annotation.IntDef;
		import android.annotation.Nullable;
		import android.media.tv.tuner.TunerConstants.FilterType;
		import android.hardware.tv.tuner.V1_0.Constants;

		import java.lang.annotation.Retention;
		import java.lang.annotation.RetentionPolicy;

		/**
		* Demux Filter configuration.
		* Filter configuration used to configure filters.
		*
		* @hide
		*/
		public abstract class FilterConfiguration {

		/** @hide */
		@IntDef({FILTER_TYPE_TS, FILTER_TYPE_MMTP, FILTER_TYPE_IP, FILTER_TYPE_TLV, FILTER_TYPE_ALP})
		@Retention(RetentionPolicy.SOURCE)
		public @interface FilterType {}

		/**
		* TS filter type.
		*/
		public static final int FILTER_TYPE_TS = Constants.DemuxFilterMainType.TS;
		/**
		* MMTP filter type.
		*/
		public static final int FILTER_TYPE_MMTP = Constants.DemuxFilterMainType.MMTP;
		/**
		* IP filter type.
		*/
		public static final int FILTER_TYPE_IP = Constants.DemuxFilterMainType.IP;
		/**
		* TLV filter type.
		*/
		public static final int FILTER_TYPE_TLV = Constants.DemuxFilterMainType.TLV;
		/**
		* ALP filter type.
		*/
		public static final int FILTER_TYPE_ALP = Constants.DemuxFilterMainType.ALP;

		@Nullable
		protected final Settings mSettings;
		private final Settings mSettings;

		protected FilterConfiguration(Settings settings) {
		/* package */ FilterConfiguration(Settings settings) {
		mSettings = settings;
		}

		/**
		* Gets filter configuration type
		* Gets filter configuration type.
		* @hide
		*/
		@FilterType
		public abstract int getType();

		/** @hide */
		@Nullable
		public Settings getSettings() {
		return mSettings;
		}