Bug 1870786 - Fix the type of RTP timestamps in WebrtcGmpVideoEncoder…

…. r=webrtc-reviewers,pehrsons,media-playback-reviewers,aosmond The keys inserted in the map come from GMPVideoEncodedFrame::TimeStamp, which returns a uint64_t, and truncation is probably not wanted, although it might just work in practice. Differential Revision: https://phabricator.services.mozilla.com/D197012
BrowserWorks · May 28, 2024 · 04b5800 · 04b5800
1 parent 0bcd201
commit 04b5800
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp b/dom/media/gmp-plugin-openh264/gmp-fake-openh264.cpp
@@ -99,7 +99,7 @@ struct EncodedFrame {
  uint8_t y_;
  uint8_t u_;
  uint8_t v_;
- uint32_t timestamp_;
+ uint64_t timestamp_;
  } idr_nalu;
 };
 #pragma pack(pop)

diff --git a/dom/media/gtest/TestGMPRemoveAndDelete.cpp b/dom/media/gtest/TestGMPRemoveAndDelete.cpp
@@ -361,7 +361,7 @@ void GMPRemoveTest::gmp_Decode() {
  uint8_t y_;
  uint8_t u_;
  uint8_t v_;
- uint32_t timestamp_;
+ uint64_t timestamp_;
  } idr_nalu;
  };
 #pragma pack(pop)

diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.cpp
@@ -540,7 +540,7 @@ void WebrtcGmpVideoEncoder::Encoded(
 
  webrtc::VideoFrameType ft;
  GmpFrameTypeToWebrtcFrameType(aEncodedFrame->FrameType(), &ft);
- uint32_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
+ uint64_t timestamp = (aEncodedFrame->TimeStamp() * 90ll + 999) / 1000;
 
  GMP_LOG_DEBUG("GMP Encoded: %" PRIu64 ", type %d, len %d",
  aEncodedFrame->TimeStamp(), aEncodedFrame->BufferType(),

diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h b/dom/media/webrtc/libwebrtcglue/WebrtcGmpVideoCodec.h
@@ -302,7 +302,7 @@ class WebrtcGmpVideoEncoder : public GMPVideoEncoderCallbackProxy,
  int64_t timestamp_us;
  };
  // Map rtp time -> input image data
- DataMutex<std::map<uint32_t, InputImageData>> mInputImageMap;
+ DataMutex<std::map<uint64_t, InputImageData>> mInputImageMap;
 
  MediaEventProducer<uint64_t> mInitPluginEvent;
  MediaEventProducer<uint64_t> mReleasePluginEvent;