Merge "Add TimeFilter APIs" (e5c13196) · Commits · e / os / android_frameworks_base

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

+122 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ public final class Tuner implements AutoCloseable {
		private native int nativeDisconnectCiCam();
		private native FrontendInfo nativeGetFrontendInfo(int id);
		private native Filter nativeOpenFilter(int type, int subType, int bufferSize);
		private native TimeFilter nativeOpenTimeFilter();

		private native List<Integer> nativeGetLnbIds();
		private native Lnb nativeOpenLnbById(int id);
		@@ -588,6 +589,127 @@ public final class Tuner implements AutoCloseable {
		return filter;
		}

		/**
		* A timer filter is used to filter data based on timestamps.
		*
		* <p> If the timestamp is set, data is discarded if its timestamp is smaller than the
		* timestamp in this time filter.
		*
		* <p> The format of the timestamps is the same as PTS defined in ISO/IEC 13818-1:2019. The
		* timestamps may or may not be related to PTS or DTS.
		*
		* @hide
		*/
		public class TimeFilter {
		private native int nativeSetTimestamp(long timestamp);
		private native int nativeClearTimestamp();
		private native Long nativeGetTimestamp();
		private native Long nativeGetSourceTime();
		private native int nativeClose();

		private boolean mEnable = false;

		/**
		* Set timestamp for time based filter.
		*
		* It is used to set initial timestamp and enable time filtering. Once set, the time will be
		* increased automatically like a clock. Contents are discarded if their timestamps are
		* older than the time in the time filter.
		*
		* This method can be called more than once to reset the initial timestamp.
		*
		* @param timestamp initial timestamp for the time filter before it's increased. It's
		* based on the 90KHz counter, and it's the same format as PTS (Presentation Time Stamp)
		* defined in ISO/IEC 13818-1:2019. The timestamps may or may not be related to PTS or DTS.
		* @return result status of the operation.
		*/
		@Result
		public int setCurrentTimestamp(long timestamp) {
		int res = nativeSetTimestamp(timestamp);
		// TODO: use a constant for SUCCESS
		if (res == 0) {
		mEnable = true;
		}
		return res;
		}

		/**
		* Clear the timestamp in the time filter.
		*
		* It is used to clear the time value of the time filter. Time filtering is disabled then.
		*
		* @return result status of the operation.
		*/
		@Result
		public int clearTimestamp() {
		int res = nativeClearTimestamp();
		if (res == 0) {
		mEnable = false;
		}
		return res;
		}

		/**
		* Get the current time in the time filter.
		*
		* It is used to inquiry current time in the time filter.
		*
		* @return current timestamp in the time filter. It's based on the 90KHz counter, and it's
		* the same format as PTS (Presentation Time Stamp) defined in ISO/IEC 13818-1:2019. The
		* timestamps may or may not be related to PTS or DTS. {@code null} if the timestamp is
		* never set.
		*/
		@Nullable
		public Long getTimeStamp() {
		if (!mEnable) {
		return null;
		}
		return nativeGetTimestamp();
		}

		/**
		* Get the timestamp from the beginning of incoming data stream.
		*
		* It is used to inquiry the timestamp from the beginning of incoming data stream.
		*
		* @return first timestamp of incoming data stream. It's based on the 90KHz counter, and
		* it's the same format as PTS (Presentation Time Stamp) defined in ISO/IEC 13818-1:2019.
		* The timestamps may or may not be related to PTS or DTS.
		*/
		@Nullable
		public Long getSourceTime() {
		if (!mEnable) {
		return null;
		}
		return nativeGetSourceTime();
		}

		/**
		* Close the Time Filter instance
		*
		* It is to release the TimeFilter instance. Resources are reclaimed so the instance must
		* not be accessed after this method is called.
		*
		* @return result status of the operation.
		*/
		@Result
		public int close() {
		return nativeClose();
		}
		}

		/**
		* Open a time filter instance.
		*
		* It is used to open time filter of demux.
		*
		* @return a time filter instance.
		* @hide
		*/
		public TimeFilter openTimeFilter() {
		return nativeOpenTimeFilter();
		}

		/** @hide */
		public class Lnb {
		private int mId;

media/jni/android_media_tv_Tuner.cpp

+45 −0

Original line number	Diff line number	Diff line
		@@ -696,6 +696,10 @@ static jobject android_media_tv_Tuner_open_filter(
		return tuner->openFilter(filterType, bufferSize);
		}

		static jobject android_media_tv_Tuner_open_time_filter(JNIEnv, jobject) {
		return NULL;
		}

		static DemuxFilterSettings getFilterSettings(
		JNIEnv *env, int type, int subtype, jobject filterSettingsObj) {
		DemuxFilterSettings filterSettings;
		@@ -840,6 +844,28 @@ static int android_media_tv_Tuner_close_filter(JNIEnv*, jobject) {
		return 0;
		}

		// TODO: implement TimeFilter functions
		static int android_media_tv_Tuner_time_filter_set_timestamp(
		JNIEnv, jobject, jlong) {
		return 0;
		}

		static int android_media_tv_Tuner_time_filter_clear_timestamp(JNIEnv, jobject) {
		return 0;
		}

		static jobject android_media_tv_Tuner_time_filter_get_timestamp(JNIEnv, jobject) {
		return NULL;
		}

		static jobject android_media_tv_Tuner_time_filter_get_source_time(JNIEnv, jobject) {
		return NULL;
		}

		static int android_media_tv_Tuner_time_filter_close(JNIEnv, jobject) {
		return 0;
		}

		static jobject android_media_tv_Tuner_open_descrambler(JNIEnv *env, jobject thiz) {
		sp<JTuner> tuner = getTuner(env, thiz);
		return tuner->openDescrambler();
		@@ -1119,6 +1145,8 @@ static const JNINativeMethod gTunerMethods[] = {
		(void *)android_media_tv_Tuner_get_frontend_info },
		{ "nativeOpenFilter", "(III)Landroid/media/tv/tuner/Tuner$Filter;",
		(void *)android_media_tv_Tuner_open_filter },
		{ "nativeOpenTimeFilter", "()Landroid/media/tv/tuner/Tuner$TimeFilter;",
		(void *)android_media_tv_Tuner_open_time_filter },
		{ "nativeGetLnbIds", "()Ljava/util/List;",
		(void *)android_media_tv_Tuner_get_lnb_ids },
		{ "nativeOpenLnbById", "(I)Landroid/media/tv/tuner/Tuner$Lnb;",
		@@ -1144,6 +1172,16 @@ static const JNINativeMethod gFilterMethods[] = {
		{ "nativeClose", "()I", (void *)android_media_tv_Tuner_close_filter },
		};

		static const JNINativeMethod gTimeFilterMethods[] = {
		{ "nativeSetTimeStamp", "(J)I", (void *)android_media_tv_Tuner_time_filter_set_timestamp },
		{ "nativeClearTimeStamp", "()I", (void *)android_media_tv_Tuner_time_filter_clear_timestamp },
		{ "nativeGetTimeStamp", "()Ljava/lang/Long;",
		(void *)android_media_tv_Tuner_time_filter_get_timestamp },
		{ "nativeGetSourceTime", "()Ljava/lang/Long;",
		(void *)android_media_tv_Tuner_time_filter_get_source_time },
		{ "nativeClose", "()I", (void *)android_media_tv_Tuner_time_filter_close },
		};

		static const JNINativeMethod gDescramblerMethods[] = {
		{ "nativeAddPid", "(IILandroid/media/tv/tuner/Tuner$Filter;)I",
		(void *)android_media_tv_Tuner_add_pid },
		@@ -1193,6 +1231,13 @@ static bool register_android_media_tv_Tuner(JNIEnv *env) {
		ALOGE("Failed to register filter native methods");
		return false;
		}
		if (AndroidRuntime::registerNativeMethods(
		env, "android/media/tv/tuner/Tuner$TimeFilter",
		gTimeFilterMethods,
		NELEM(gTimeFilterMethods)) != JNI_OK) {
		ALOGE("Failed to register time filter native methods");
		return false;
		}
		if (AndroidRuntime::registerNativeMethods(
		env, "android/media/tv/tuner/Tuner$Descrambler",
		gDescramblerMethods,