| commit | fe3f8a720bbf95b30aad5bacd5fe5d3e3404e332 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Apr 10 07:32:55 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Apr 10 07:32:55 2021 +0000 |
| tree | 63146aa530830536a9c81db6b3026259bfdd25fa | |
| parent | e2c86a9cfaf0bb8f967c7ff437f837b0a6cba7a1 [diff] | |
| parent | 437f549b004c64f7885a6e46bfcddd958f4ba7aa [diff] |
Merge "codec2: Set custom ordinal for inputs processed by FrameReassembler" am: 5e3cf46b7f am: 437f549b00 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1648893 Change-Id: Ic95dbf8e67eb68ae2282a508925dd7985dcc0356
diff --git a/media/codec2/sfplugin/FrameReassembler.cpp b/media/codec2/sfplugin/FrameReassembler.cpp index f8e6937..cf1be17 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(); }