Bug 1889627 - Use webrtc::CodecParameterMap where applicable. r=webrtc-reviewers,dbaker

The older types are deprecated.

Differential Revision: https://phabricator.services.mozilla.com/D206628
This commit is contained in:
Andreas Pehrson 2024-04-04 15:44:47 +00:00
parent a4e2337c4d
commit 5eebee76e7
5 changed files with 8 additions and 8 deletions

View File

@ -907,7 +907,7 @@ RtpExtList WebrtcAudioConduit::FilterExtensions(LocalDirection aDirection,
webrtc::SdpAudioFormat WebrtcAudioConduit::CodecConfigToLibwebrtcFormat(
const AudioCodecConfig& aConfig) {
webrtc::SdpAudioFormat::Parameters parameters;
webrtc::CodecParameterMap parameters;
if (aConfig.mName == kOpusCodecName) {
if (aConfig.mChannels == 2) {
parameters[kCodecParamStereo] = kParamValueTrue;

View File

@ -190,7 +190,7 @@ webrtc::VideoCodecType SupportedCodecType(webrtc::VideoCodecType aType) {
rtc::scoped_refptr<webrtc::VideoEncoderConfig::EncoderSpecificSettings>
ConfigureVideoEncoderSettings(const VideoCodecConfig& aConfig,
const WebrtcVideoConduit* aConduit,
webrtc::SdpVideoFormat::Parameters& aParameters) {
webrtc::CodecParameterMap& aParameters) {
bool is_screencast =
aConduit->CodecMode() == webrtc::VideoCodecMode::kScreensharing;
// No automatic resizing when using simulcast or screencast.

View File

@ -289,7 +289,7 @@ class WebrtcGmpVideoEncoder : public GMPVideoEncoderCallbackProxy,
GMPVideoHost* mHost;
GMPVideoCodec mCodecParams;
uint32_t mMaxPayloadSize;
const webrtc::SdpVideoFormat::Parameters mFormatParams;
const webrtc::CodecParameterMap mFormatParams;
webrtc::CodecSpecificInfo mCodecSpecificInfo;
webrtc::H264BitstreamParser mH264BitstreamParser;
// Protects mCallback

View File

@ -75,7 +75,7 @@ static const char* PacketModeStr(const webrtc::CodecSpecificInfo& aInfo) {
}
static std::pair<H264_PROFILE, H264_LEVEL> ConvertProfileLevel(
const webrtc::SdpVideoFormat::Parameters& aParameters) {
const webrtc::CodecParameterMap& aParameters) {
const absl::optional<webrtc::H264ProfileLevelId> profileLevel =
webrtc::ParseSdpForH264ProfileLevelId(aParameters);
@ -143,9 +143,9 @@ WebrtcMediaDataEncoder::~WebrtcMediaDataEncoder() {
}
}
static void InitCodecSpecficInfo(
webrtc::CodecSpecificInfo& aInfo, const webrtc::VideoCodec* aCodecSettings,
const webrtc::SdpVideoFormat::Parameters& aParameters) {
static void InitCodecSpecficInfo(webrtc::CodecSpecificInfo& aInfo,
const webrtc::VideoCodec* aCodecSettings,
const webrtc::CodecParameterMap& aParameters) {
MOZ_ASSERT(aCodecSettings);
aInfo.codecType = aCodecSettings->codecType;

View File

@ -65,7 +65,7 @@ class WebrtcMediaDataEncoder : public RefCountedWebrtcVideoEncoder {
MediaResult mError = NS_OK;
VideoInfo mInfo;
webrtc::SdpVideoFormat::Parameters mFormatParams;
webrtc::CodecParameterMap mFormatParams;
webrtc::CodecSpecificInfo mCodecSpecific;
webrtc::BitrateAdjuster mBitrateAdjuster;
uint32_t mMaxFrameRate = {0};