From d097790ac5d12dbefb53ae802a46811547eaa229 Mon Sep 17 00:00:00 2001
From: shubang <shubang@google.com>
Date: Thu, 7 Nov 2019 18:58:43 -0800
Subject: [PATCH] Add filter start, stop, flush methods

Test: make; acloud;
Change-Id: I3dbc8f305c998729deae4cf7c03135c8d3a0db93
---
 media/java/android/media/tv/tuner/Tuner.java | 17 ++++++
 media/jni/android_media_tv_Tuner.cpp         | 54 ++++++++++++++++++--
 2 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java
index 7d68d0279f1f3..ce0e89d2f1225 100644
--- a/media/java/android/media/tv/tuner/Tuner.java
+++ b/media/java/android/media/tv/tuner/Tuner.java
@@ -193,6 +193,11 @@ public final class Tuner implements AutoCloseable  {
         private long mNativeContext;
         private FilterCallback mCallback;
         int mId;
+
+        private native boolean nativeStartFilter();
+        private native boolean nativeStopFilter();
+        private native boolean nativeFlushFilter();
+
         private Filter(int id) {
             mId = id;
         }
@@ -203,6 +208,18 @@ public final class Tuner implements AutoCloseable  {
                         mHandler.obtainMessage(MSG_ON_FILTER_STATUS, status, 0, this));
             }
         }
+
+        public boolean start() {
+            return nativeStartFilter();
+        }
+
+        public boolean stop() {
+            return nativeStopFilter();
+        }
+
+        public boolean flush() {
+            return nativeFlushFilter();
+        }
     }
 
     private Filter openFilter(int type, int subType, int bufferSize, FilterCallback cb) {
diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 26405720c31f6..ad71d70ca0fde 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -308,7 +308,34 @@ static jobject android_media_tv_Tuner_open_filter(
     return tuner->openFilter(filterType, bufferSize);
 }
 
-static const JNINativeMethod gMethods[] = {
+static bool android_media_tv_Tuner_start_filter(JNIEnv *env, jobject filter) {
+    sp<IFilter> filterSp = getFilter(env, filter);
+    if (filterSp == NULL) {
+        ALOGD("Failed to start filter: filter not found");
+        return false;
+    }
+    return filterSp->start() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_stop_filter(JNIEnv *env, jobject filter) {
+    sp<IFilter> filterSp = getFilter(env, filter);
+    if (filterSp == NULL) {
+        ALOGD("Failed to stop filter: filter not found");
+        return false;
+    }
+    return filterSp->stop() == Result::SUCCESS;
+}
+
+static bool android_media_tv_Tuner_flush_filter(JNIEnv *env, jobject filter) {
+    sp<IFilter> filterSp = getFilter(env, filter);
+    if (filterSp == NULL) {
+        ALOGD("Failed to flush filter: filter not found");
+        return false;
+    }
+    return filterSp->flush() == Result::SUCCESS;
+}
+
+static const JNINativeMethod gTunerMethods[] = {
     { "nativeInit", "()V", (void *)android_media_tv_Tuner_native_init },
     { "nativeSetup", "()V", (void *)android_media_tv_Tuner_native_setup },
     { "nativeGetFrontendIds", "()Ljava/util/List;",
@@ -319,9 +346,26 @@ static const JNINativeMethod gMethods[] = {
             (void *)android_media_tv_Tuner_open_filter },
 };
 
-static int register_android_media_tv_Tuner(JNIEnv *env) {
-    return AndroidRuntime::registerNativeMethods(
-            env, "android/media/tv/tuner/Tuner", gMethods, NELEM(gMethods));
+static const JNINativeMethod gFilterMethods[] = {
+    { "nativeStartFilter", "()Z", (void *)android_media_tv_Tuner_start_filter },
+    { "nativeStopFilter", "()Z", (void *)android_media_tv_Tuner_stop_filter },
+    { "nativeFlushFilter", "()Z", (void *)android_media_tv_Tuner_flush_filter },
+};
+
+static bool register_android_media_tv_Tuner(JNIEnv *env) {
+    if (AndroidRuntime::registerNativeMethods(
+            env, "android/media/tv/tuner/Tuner", gTunerMethods, NELEM(gTunerMethods)) != JNI_OK) {
+        ALOGE("Failed to register tuner native methods");
+        return false;
+    }
+    if (AndroidRuntime::registerNativeMethods(
+            env, "android/media/tv/tuner/Tuner$Filter",
+            gFilterMethods,
+            NELEM(gFilterMethods)) != JNI_OK) {
+        ALOGE("Failed to register filter native methods");
+        return false;
+    }
+    return true;
 }
 
 jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
@@ -335,7 +379,7 @@ jint JNI_OnLoad(JavaVM* vm, void* /* reserved */)
     }
     assert(env != NULL);
 
-    if (register_android_media_tv_Tuner(env) != JNI_OK) {
+    if (!register_android_media_tv_Tuner(env)) {
         ALOGE("ERROR: Tuner native registration failed\n");
         return result;
     }