CCodec: fix MAX_PTS_GAP behavior
- Fix MAX_PTS_GAP calculation to avoid undefined behavior.
- Restore input timestamp for input surface use case.
Bug: 128934821
Test: atest CtsMediaTestCases:SurfaceEncodeTimestampTest
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I381d9c5e2d097961388c04d7ef5e8aacd51624a2
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index fb6af93..7d0a021 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2709,6 +2709,10 @@
c2_cntr64_t timestamp =
worklet->output.ordinal.timestamp + work->input.ordinal.customOrdinal
- work->input.ordinal.timestamp;
+ if (mInputSurface != nullptr) {
+ // When using input surface we need to restore the original input timestamp.
+ timestamp = work->input.ordinal.customOrdinal;
+ }
ALOGV("[%s] onWorkDone: input %lld, codec %lld => output %lld => %lld",
mName,
work->input.ordinal.customOrdinal.peekll(),