Bug 1896758 - Part 3. Add min/max bitrate to EncoderConfig. r=media-p…

…layback-reviewers,padenot Differential Revision: https://phabricator.services.mozilla.com/D211652
Brli · May 27, 2024 · 56bf9a8 · 56bf9a8
1 parent e982772
commit 56bf9a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/dom/media/gtest/TestMediaDataEncoder.cpp b/dom/media/gtest/TestMediaDataEncoder.cpp
@@ -175,7 +175,7 @@ already_AddRefed<MediaDataEncoder> CreateVideoEncoder(
       EncoderConfig(aCodec, gfx::IntSize{aWidth, aHeight}, aUsage, aPixelFormat,
                     aPixelFormat, FRAME_RATE /* FPS */,
                     KEYFRAME_INTERVAL /* keyframe interval */,
-                    BIT_RATE /* bitrate */, BIT_RATE_MODE, pref,
+                    BIT_RATE /* bitrate */, 0, 0, BIT_RATE_MODE, pref,
                     aScalabilityMode, aSpecific),
       taskQueue);
 

diff --git a/dom/media/platforms/EncoderConfig.h b/dom/media/platforms/EncoderConfig.h
@@ -125,6 +125,7 @@ class EncoderConfig final {
                 const Usage aUsage, const PixelFormat aPixelFormat,
                 const PixelFormat aSourcePixelFormat, const uint8_t aFramerate,
                 const size_t aKeyframeInterval, const uint32_t aBitrate,
+                const uint32_t aMinBitrate, const uint32_t aMaxBitrate,
                 const BitrateMode aBitrateMode,
                 const HardwarePreference aHardwarePreference,
                 const ScalabilityMode aScalabilityMode,
@@ -133,6 +134,8 @@ class EncoderConfig final {
         mSize(aSize),
         mBitrateMode(aBitrateMode),
         mBitrate(aBitrate),
+        mMinBitrate(aMinBitrate),
+        mMaxBitrate(aMaxBitrate),
         mUsage(aUsage),
         mHardwarePreference(aHardwarePreference),
         mPixelFormat(aPixelFormat),
@@ -173,6 +176,8 @@ class EncoderConfig final {
   gfx::IntSize mSize{};
   BitrateMode mBitrateMode{};
   uint32_t mBitrate{};
+  uint32_t mMinBitrate{};
+  uint32_t mMaxBitrate{};
   Usage mUsage{};
   // Video-only
   HardwarePreference mHardwarePreference{};

diff --git a/dom/media/webcodecs/VideoEncoder.cpp b/dom/media/webcodecs/VideoEncoder.cpp
@@ -276,7 +276,7 @@ EncoderConfig VideoEncoderConfigInternal::ToEncoderConfig() const {
   return EncoderConfig(codecType, {mWidth, mHeight}, usage,
                        ImageBitmapFormat::RGBA32, ImageBitmapFormat::RGBA32,
                        AssertedCast<uint8_t>(mFramerate.refOr(0.f)), 0,
-                       mBitrate.refOr(0),
+                       mBitrate.refOr(0), 0, 0,
                        mBitrateMode == VideoEncoderBitrateMode::Constant
                            ? mozilla::BitrateMode::Constant
                            : mozilla::BitrateMode::Variable,

diff --git a/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp b/dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp
@@ -291,8 +291,9 @@ already_AddRefed<MediaDataEncoder> WebrtcMediaDataEncoder::CreateEncoder(
       type, {aCodecSettings->width, aCodecSettings->height}, Usage::Realtime,
       dom::ImageBitmapFormat::YUV420P, dom::ImageBitmapFormat::YUV420P,
       aCodecSettings->maxFramerate, keyframeInterval,
-      mBitrateAdjuster.GetTargetBitrateBps(), BitrateMode::Variable,
-      HardwarePreference::None, ScalabilityMode::None, specific);
+      mBitrateAdjuster.GetTargetBitrateBps(), mMinBitrateBps, mMaxBitrateBps,
+      BitrateMode::Variable, HardwarePreference::None, ScalabilityMode::None,
+      specific);
   return mFactory->CreateEncoder(config, mTaskQueue);
 }