commit 68afca6d7caea032486d55b9feb58a811742a4c7
author Amy Zhang <amyjojo@google.com> Mon Jul 20 18:28:58 2020 -0700
committer Amy Zhang <amyjojo@google.com> Fri Jul 24 10:42:43 2020 -0700
tree a88aa9fdbf1853149e6bc138d71a442e08ce6588
parent 80cb96048b6c07666e508137201b4f2a03a6da34

Add the PTS field for recording-time indexing in the DemuxFilterEvent

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158816517
Change-Id: Ib29fd0f55aaae2fb44b77f754cceb5152fc7158d

tv/tuner/1.1/default/Dvr.cpp

diff --git a/tv/tuner/1.1/default/Dvr.cpp b/tv/tuner/1.1/default/Dvr.cpp
index 02d6a42..bf4c77e 100644
--- a/tv/tuner/1.1/default/Dvr.cpp
+++ b/tv/tuner/1.1/default/Dvr.cpp
@@ -217,9 +217,11 @@
                 break;
             }
             maySendPlaybackStatusCallback();
+            continue;
         }
         // Our current implementation filter the data and write it into the filter FMQ immediately
         // after the DATA_READY from the VTS/framework
+        // This is for the non-ES data source, real playback use case handling.
         if (!readPlaybackFMQ(false /*isVirtualFrontend*/, false /*isRecording*/) ||
             !startFilterDispatcher(false /*isVirtualFrontend*/, false /*isRecording*/)) {
             ALOGE("[Dvr] playback data failed to be filtered. Ending thread");
@@ -380,20 +382,19 @@
     for (int i = 0; i < totalFrames; i++) {
         frameData.resize(esMeta[i].len);
         pid = esMeta[i].isAudio ? audioPid : videoPid;
-        memcpy(dataOutputBuffer.data() + esMeta[i].startIndex, frameData.data(), esMeta[i].len);
-        // Send to the media filter
-        if (isVirtualFrontend && isRecording) {
-            // TODO validate record
-            mDemux->sendFrontendInputToRecord(frameData);
-        } else {
+        memcpy(frameData.data(), dataOutputBuffer.data() + esMeta[i].startIndex, esMeta[i].len);
+        // Send to the media filters or record filters
+        if (!isRecording) {
             for (it = mFilters.begin(); it != mFilters.end(); it++) {
                 if (pid == mDemux->getFilterTpid(it->first)) {
                     mDemux->updateMediaFilterOutput(it->first, frameData,
                                                     static_cast<uint64_t>(esMeta[i].pts));
-                    startFilterDispatcher(isVirtualFrontend, isRecording);
                 }
             }
+        } else {
+            mDemux->sendFrontendInputToRecord(frameData, pid, static_cast<uint64_t>(esMeta[i].pts));
         }
+        startFilterDispatcher(isVirtualFrontend, isRecording);
     }
 
     return true;