tor-browser

commit 51ea564fcaeffdbd16ba1952fa6a415bfbe9d785
parent e19013799e222e152599994cf307059a84d64664
Author: Andrew Osmond <aosmond@gmail.com>
Date:   Tue, 23 Dec 2025 23:03:04 +0000

Bug 2005011 - Part 6. Shuffle FFmpegDecoderModule member variable initialization. r=media-playback-reviewers,padenot

We will need mInfo set before we decide whether or not to disable
hardware decoding.

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

Diffstat:
M
dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
 | 
4
++--
M
dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
 | 
5
++---

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
@@ -585,12 +585,12 @@ FFmpegVideoDecoder<LIBAV_VER>::FFmpegVideoDecoder(
     Maybe<TrackingId> aTrackingId, PRemoteCDMActor* aCDM)
     : FFmpegDataDecoder(aLib, GetCodecId(aConfig.mMimeType), aCDM),
       mImageAllocator(aAllocator),
+      mImageContainer(aImageContainer),
+      mInfo(aConfig),
 #ifdef MOZ_USE_HWDECODE
       mHardwareDecodingDisabled(
           ShouldDisableHWDecoding(aDisableHardwareDecoding)),
 #endif  // MOZ_USE_HWDECODE
-      mImageContainer(aImageContainer),
-      mInfo(aConfig),
       mLowLatency(aLowLatency),
       mTrackingId(std::move(aTrackingId)),
       // Value may be changed later when codec is known after initialization.
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
@@ -162,6 +162,8 @@ class FFmpegVideoDecoder<LIBAV_VER>
 #endif
 
   RefPtr<KnowsCompositor> mImageAllocator;
+  RefPtr<ImageContainer> mImageContainer;
+  VideoInfo mInfo;
 
 #ifdef MOZ_USE_HWDECODE
  public:
@@ -240,9 +242,6 @@ class FFmpegVideoDecoder<LIBAV_VER>
   static nsTArray<AVCodecID> mAcceleratedFormats;
 #endif
 
-  RefPtr<ImageContainer> mImageContainer;
-  VideoInfo mInfo;
-
 #if LIBAVCODEC_VERSION_MAJOR >= 58
   class DecodeStats {
    public: