Bug 1164061 - WebRTC - move TMMBR behind pref r=jesup

This commit is contained in:
Ethan Hugg 2015-05-12 08:33:48 -07:00
parent a49bf43fb2
commit 9b0603bad4
2 changed files with 9 additions and 2 deletions

View File

@ -324,8 +324,10 @@ struct JsepVideoCodecDescription : public JsepCodecDescription {
mDefaultPt, SdpRtcpFbAttributeList::kNack, SdpRtcpFbAttributeList::pli);
rtcpfb.PushEntry(
mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::fir);
rtcpfb.PushEntry(
mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::tmmbr);
if (mUseTmmbr) {
rtcpfb.PushEntry(
mDefaultPt, SdpRtcpFbAttributeList::kCcm, SdpRtcpFbAttributeList::tmmbr);
}
}
SdpFmtpAttributeList::H264Parameters
@ -668,6 +670,7 @@ struct JsepVideoCodecDescription : public JsepCodecDescription {
uint32_t mMaxCpb;
uint32_t mMaxDpb;
uint32_t mMaxBr;
bool mUseTmmbr;
std::string mSpropParameterSets;
};

View File

@ -966,6 +966,10 @@ PeerConnectionImpl::ConfigureJsepSessionCodecs() {
videoCodec.mMaxFr = maxFr;
}
videoCodec.mUseTmmbr = false;
branch->GetBoolPref("media.navigator.video.use_tmmbr",
&videoCodec.mUseTmmbr);
}
break;
case SdpMediaSection::kText: