Merge "remove fmq reference when dvr and filter are closed." into sc-dev

2021-03-16 07:01:16 +00:00
parent d4481aeca1 bc30a4b182
commit 8d57444196
2 changed files with 10 additions and 0 deletions
--- a/media/jni/tuner/DvrClient.cpp
+++ b/media/jni/tuner/DvrClient.cpp
@@ -314,6 +314,11 @@ Result DvrClient::flush() {
 }

 Result DvrClient::close() {
+    if (mDvrMQEventFlag != NULL) {
+        EventFlag::deleteEventFlag(&mDvrMQEventFlag);
+    }
+    mDvrMQ = NULL;
+
    if (mTunerDvr != NULL) {
        Status s = mTunerDvr->close();
        mTunerDvr = NULL;
--- a/media/jni/tuner/FilterClient.cpp
+++ b/media/jni/tuner/FilterClient.cpp
@@ -259,6 +259,11 @@ Result FilterClient::setDataSource(sp<FilterClient> filterClient){
 }

 Result FilterClient::close() {
+    if (mFilterMQEventFlag != NULL) {
+        EventFlag::deleteEventFlag(&mFilterMQEventFlag);
+    }
+    mFilterMQ = NULL;
+
    if (mTunerFilter != NULL) {
        Status s = mTunerFilter->close();
        closeAvSharedMemory();