tor-browser

commit 49db13e7b2be852566eda450ed418e5a7f10d665
parent 9ce1366f3457434038aa8db061273a9b981b318a
Author: Andrew Osmond <aosmond@gmail.com>
Date:   Tue, 25 Nov 2025 15:11:20 +0000

Bug 2001775 - MediaFormatReader::DecodeDemuxedSamples should copy crypto info for remote CDMs. r=media-playback-reviewers,azebrowski

Differential Revision: https://phabricator.services.mozilla.com/D273705

Diffstat:
M
dom/media/MediaFormatReader.cpp
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
@@ -2108,7 +2108,8 @@ void MediaFormatReader::DecodeDemuxedSamples(TrackType aTrack,
           aSample->mEOS ? " eos" : "");
 
   decoder.StartRecordDecodingPerf(aTrack, aSample);
-  if (mMediaEngineId && aSample->mCrypto.IsEncrypted()) {
+  if (aSample->mCrypto.IsEncrypted() &&
+      (mMediaEngineId || (mCDMProxy && !!mCDMProxy->AsRemoteCDMChild()))) {
     aSample->mShouldCopyCryptoToRemoteRawData = true;
   }
   decoder.mDecoder->Decode(aSample)