commit 9b3b04f767b65b39c74e7f3cf990f9461d1d1501
author Treehugger Robot <treehugger-gerrit@google.com> Sat Apr 10 08:03:36 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Apr 10 08:03:36 2021 +0000
tree 8f739d7ac3bb81160549b9528415d1e328cc0d17
parent 2554072a9406b3085c2d7065cc987b0fe2cb8d2b
parent fe3f8a720bbf95b30aad5bacd5fe5d3e3404e332

Merge "codec2: Set custom ordinal for inputs processed by FrameReassembler" am: 5e3cf46b7f am: 437f549b00 am: fe3f8a720b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1648893

Change-Id: I3417525c19515807fdb3363d8b03b59de2e67b7a

media/codec2/sfplugin/FrameReassembler.cpp

diff --git a/media/codec2/sfplugin/FrameReassembler.cpp b/media/codec2/sfplugin/FrameReassembler.cpp
index 9cec23f..af054c7 100644
--- a/media/codec2/sfplugin/FrameReassembler.cpp
+++ b/media/codec2/sfplugin/FrameReassembler.cpp
@@ -143,6 +143,7 @@
 
     if (buffer->size() > 0) {
         mCurrentOrdinal.timestamp = timeUs;
+        mCurrentOrdinal.customOrdinal = timeUs;
     }
 
     size_t frameSizeBytes = mFrameSize.value() * mChannelCount * bytesPerSample();
@@ -219,6 +220,7 @@
 
     ++mCurrentOrdinal.frameIndex;
     mCurrentOrdinal.timestamp += mFrameSize.value() * 1000000 / mSampleRate;
+    mCurrentOrdinal.customOrdinal = mCurrentOrdinal.timestamp;
     mCurrentBlock.reset();
     mWriteView.reset();
 }