nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1749047 - Implement plumbing for SVC. r=chunmin,webidl,smaug

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D196473
This commit is contained in:
Paul Adenot 2023-12-22 21:39:18 +00:00
parent 0f889104cd
commit a690660c44
5 changed files with 29 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
dom/media/gtest/TestMediaDataEncoder.cpp
View file

@ -174,7 +174,7 @@ already_AddRefed<MediaDataEncoder> CreateVideoEncoder(
EncoderConfig(aCodec, gfx::IntSize{aWidth, aHeight}, aUsage, aPixelFormat, EncoderConfig(aCodec, gfx::IntSize{aWidth, aHeight}, aUsage, aPixelFormat,
aPixelFormat, FRAME_RATE /* FPS */, aPixelFormat, FRAME_RATE /* FPS */,
KEYFRAME_INTERVAL /* keyframe interval */, KEYFRAME_INTERVAL /* keyframe interval */,
BIT_RATE /* bitrate */, BIT_RATE_MODE, pref, aSpecific), BIT_RATE /* bitrate */, BIT_RATE_MODE, pref, MediaDataEncoder::ScalabilityMode::None, aSpecific),
taskQueue); taskQueue);
return e.forget(); return e.forget();

5
dom/media/platforms/PlatformEncoderModule.h
View file

@ -150,6 +150,7 @@ class MediaDataEncoder {
}; };
using PixelFormat = dom::ImageBitmapFormat; using PixelFormat = dom::ImageBitmapFormat;
enum BitrateMode { Constant, Variable }; enum BitrateMode { Constant, Variable };
enum ScalabilityMode { None, L1T2, L1T3 };
enum class HardwarePreference { RequireHardware, RequireSoftware, None }; enum class HardwarePreference { RequireHardware, RequireSoftware, None };
@ -238,6 +239,7 @@ class EncoderConfig final {
mHardwarePreference(aConfig.mHardwarePreference), mHardwarePreference(aConfig.mHardwarePreference),
mPixelFormat(aConfig.mPixelFormat), mPixelFormat(aConfig.mPixelFormat),
mSourcePixelFormat(aConfig.mSourcePixelFormat), mSourcePixelFormat(aConfig.mSourcePixelFormat),
mScalabilityMode(aConfig.mScalabilityMode),
mFramerate(aConfig.mFramerate), mFramerate(aConfig.mFramerate),
mKeyframeInterval(aConfig.mKeyframeInterval), mKeyframeInterval(aConfig.mKeyframeInterval),
mBitrate(aConfig.mBitrate), mBitrate(aConfig.mBitrate),
@ -253,6 +255,7 @@ class EncoderConfig final {
const uint32_t aBitrate, const uint32_t aBitrate,
const MediaDataEncoder::BitrateMode aBitrateMode, const MediaDataEncoder::BitrateMode aBitrateMode,
const MediaDataEncoder::HardwarePreference aHardwarePreference, const MediaDataEncoder::HardwarePreference aHardwarePreference,
const MediaDataEncoder::ScalabilityMode aScalabilityMode,
const Maybe<CodecSpecific>& aCodecSpecific) const Maybe<CodecSpecific>& aCodecSpecific)
: mCodec(aCodecType), : mCodec(aCodecType),
mSize(aSize), mSize(aSize),
@ -260,6 +263,7 @@ class EncoderConfig final {
mHardwarePreference(aHardwarePreference), mHardwarePreference(aHardwarePreference),
mPixelFormat(aPixelFormat), mPixelFormat(aPixelFormat),
mSourcePixelFormat(aSourcePixelFormat), mSourcePixelFormat(aSourcePixelFormat),
mScalabilityMode(aScalabilityMode),
mFramerate(aFramerate), mFramerate(aFramerate),
mKeyframeInterval(aKeyframeInterval), mKeyframeInterval(aKeyframeInterval),
mBitrate(aBitrate), mBitrate(aBitrate),
@ -294,6 +298,7 @@ class EncoderConfig final {
MediaDataEncoder::HardwarePreference mHardwarePreference; MediaDataEncoder::HardwarePreference mHardwarePreference;
MediaDataEncoder::PixelFormat mPixelFormat; MediaDataEncoder::PixelFormat mPixelFormat;
MediaDataEncoder::PixelFormat mSourcePixelFormat; MediaDataEncoder::PixelFormat mSourcePixelFormat;
MediaDataEncoder::ScalabilityMode mScalabilityMode;
uint8_t mFramerate{}; uint8_t mFramerate{};
size_t mKeyframeInterval{}; size_t mKeyframeInterval{};
uint32_t mBitrate{}; uint32_t mBitrate{};

20
dom/media/webcodecs/VideoEncoder.cpp
View file

@ -250,13 +250,25 @@ EncoderConfig VideoEncoderConfigInternal::ToEncoderConfig() const {
#endif #endif
specific.emplace(VP9Specific()); specific.emplace(VP9Specific());
} }
MediaDataEncoder::ScalabilityMode scalabilityMode;
if (mScalabilityMode) {
if (mScalabilityMode->EqualsLiteral("L1T2")) {
scalabilityMode = MediaDataEncoder::ScalabilityMode::L1T2;
} else if (mScalabilityMode->EqualsLiteral("L1T3")) {
scalabilityMode = MediaDataEncoder::ScalabilityMode::L1T3;
} else {
scalabilityMode = MediaDataEncoder::ScalabilityMode::None;
}
} else {
scalabilityMode = MediaDataEncoder::ScalabilityMode::None;
}
return EncoderConfig( return EncoderConfig(
codecType, {mWidth, mHeight}, usage, ImageBitmapFormat::RGBA32, ImageBitmapFormat::RGBA32, codecType, {mWidth, mHeight}, usage, ImageBitmapFormat::RGBA32, ImageBitmapFormat::RGBA32,
AssertedCast<uint8_t>(mFramerate.refOr(0.f)), 0, mBitrate.refOr(0), AssertedCast<uint8_t>(mFramerate.refOr(0.f)), 0, mBitrate.refOr(0),
mBitrateMode == VideoEncoderBitrateMode::Constant mBitrateMode == VideoEncoderBitrateMode::Constant
? MediaDataEncoder::BitrateMode::Constant ? MediaDataEncoder::BitrateMode::Constant
: MediaDataEncoder::BitrateMode::Variable, : MediaDataEncoder::BitrateMode::Variable,
hwPref, specific); hwPref, scalabilityMode, specific);
} }
already_AddRefed<WebCodecsConfigurationChangeList> already_AddRefed<WebCodecsConfigurationChangeList>
VideoEncoderConfigInternal::Diff( VideoEncoderConfigInternal::Diff(
@ -343,8 +355,10 @@ static bool CanEncode(const RefPtr<VideoEncoderConfigInternal>& aConfig) {
// Not supported // Not supported
if (aConfig->mScalabilityMode.isSome() && if (aConfig->mScalabilityMode.isSome() &&
!aConfig->mScalabilityMode->IsEmpty()) { !aConfig->mScalabilityMode->EqualsLiteral("L1T2") &&
LOGE("Scalability mode not supported"); !aConfig->mScalabilityMode->EqualsLiteral("L1T3")) {
LOGE("Scalability mode %s not supported",
NS_ConvertUTF16toUTF8(aConfig->mScalabilityMode.value()).get());
return false; return false;
} }

3
dom/media/webrtc/libwebrtcglue/WebrtcMediaDataEncoderCodec.cpp
View file

@ -291,7 +291,8 @@ already_AddRefed<MediaDataEncoder> WebrtcMediaDataEncoder::CreateEncoder(
MediaDataEncoder::PixelFormat::YUV420P, aCodecSettings->maxFramerate, MediaDataEncoder::PixelFormat::YUV420P, aCodecSettings->maxFramerate,
keyframeInterval, mBitrateAdjuster.GetTargetBitrateBps(), keyframeInterval, mBitrateAdjuster.GetTargetBitrateBps(),
MediaDataEncoder::BitrateMode::Variable, MediaDataEncoder::BitrateMode::Variable,
MediaDataEncoder::HardwarePreference::None, specific); MediaDataEncoder::HardwarePreference::None,
MediaDataEncoder::ScalabilityMode::None, specific);
return mFactory->CreateEncoder(config, mTaskQueue); return mFactory->CreateEncoder(config, mTaskQueue);
} }

10
dom/webidl/VideoEncoder.webidl
View file

@ -110,13 +110,11 @@ dictionary VideoEncoderSupport {
dictionary EncodedVideoChunkMetadata { dictionary EncodedVideoChunkMetadata {
VideoDecoderConfig decoderConfig; VideoDecoderConfig decoderConfig;
// Not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1867066 SvcOutputMetadata svc;
// SvcOutputMetadata svc;
// Not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1867067 // Not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1867067
// BufferSource alphaSideData; // BufferSource alphaSideData;
}; };
// Not implemented https://bugzilla.mozilla.org/show_bug.cgi?id=1867066 dictionary SvcOutputMetadata {
// dictionary SvcOutputMetadata { unsigned long temporalLayerId;
// unsigned long temporalLayerId; };
// };