Fix timestamp precision loss in onevpl

In widevine L3 stream play test, the timestamps between Load and Decode have gaps. Tracked-On: OAM-124689 Signed-off-by: Nana Zhang <[email protected]> (cherry picked from commit 5cb9ea7) Tracked-On: OAM-128364 Signed-off-by: Lina Sun <[email protected]>
projectceladon · Dec 10, 2024 · 9b25003 · 9b25003
1 parent 4a67e19
commit 9b25003
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/c2_components/src/mfx_c2_decoder_component.cpp b/c2_components/src/mfx_c2_decoder_component.cpp
@@ -2550,7 +2550,7 @@ void MfxC2DecoderComponent::WaitWork(MfxC2FrameOut&& frame_out, mfxSyncPoint syn
         }
     }
 
-    decltype(C2WorkOrdinalStruct::timestamp) ready_timestamp{mfx_surface->Data.TimeStamp};
+    uint64_t ready_timestamp = mfx_surface->Data.TimeStamp;
 
     std::unique_ptr<C2Work> work;
     std::unique_ptr<C2ReadView> read_view;
@@ -2559,7 +2559,10 @@ void MfxC2DecoderComponent::WaitWork(MfxC2FrameOut&& frame_out, mfxSyncPoint syn
         std::lock_guard<std::mutex> lock(m_pendingWorksMutex);
 
         auto it = find_if(m_pendingWorks.begin(), m_pendingWorks.end(), [ready_timestamp] (const auto &item) {
-            return item.second->input.ordinal.timestamp == ready_timestamp;
+            // In some cases, operations in oneVPL may result in timestamp gaps.
+            // To ensure that we correctly identify the work, we replicate the same operations as performed in oneVPL.
+            return item.second->input.ordinal.timestamp.peeku() == ready_timestamp ||
+                   GetMfxTimeStamp(GetUmcTimeStamp(item.second->input.ordinal.timestamp.peeku())) == ready_timestamp;
         });
 
         if (it != m_pendingWorks.end()) {

diff --git a/c2_utils/include/mfx_c2_utils.h b/c2_utils/include/mfx_c2_utils.h
@@ -28,9 +28,21 @@
 
 c2_status_t MfxStatusToC2(mfxStatus mfx_status);
 
+static const mfxU32 MFX_TIME_STAMP_FREQUENCY = 90000;
+
+inline mfxF64 GetUmcTimeStamp(mfxU64 ts)
+{
+    return ts / (mfxF64)MFX_TIME_STAMP_FREQUENCY;
+}
+
+inline mfxU64 GetMfxTimeStamp(mfxF64 ts)
+{
+    return (mfxU64)(ts * MFX_TIME_STAMP_FREQUENCY + .5);
+}
+
 inline mfxU64 TimestampC2ToMfx(uint64_t timestamp)
 {
-    return timestamp * 90000 / MFX_SECOND_NS;
+    return timestamp * MFX_TIME_STAMP_FREQUENCY / MFX_SECOND_NS;
 }
 
 c2_status_t GetC2ConstGraphicBlock(