wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1191301 - Re-enable the use of media.navigator.video.use_tmmbr pref. r=bwc

Browse Source
This commit is contained in:
Ethan Hugg 2015-08-24 09:31:38 -07:00
parent 96c49832f2
commit e2ca5bd69b
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
media/webrtc/signaling/src/jsep/JsepCodecDescription.h
View File

@ -204,16 +204,17 @@ struct JsepVideoCodecDescription : public JsepCodecDescription {
mMaxMbps(0),
mMaxCpb(0),
mMaxDpb(0),
mMaxBr(0),
mUseTmmbr(false)
mMaxBr(0)
{
// Add supported rtcp-fb types
mNackFbTypes.push_back("");
mNackFbTypes.push_back(SdpRtcpFbAttributeList::pli);
mCcmFbTypes.push_back(SdpRtcpFbAttributeList::fir);
if (mUseTmmbr) {
mCcmFbTypes.push_back(SdpRtcpFbAttributeList::tmmbr);
}
virtual void
EnableTmmbr() {
mCcmFbTypes.push_back(SdpRtcpFbAttributeList::tmmbr);
}
virtual void
@ -596,7 +597,6 @@ struct JsepVideoCodecDescription : public JsepCodecDescription {
uint32_t mMaxCpb;
uint32_t mMaxDpb;
uint32_t mMaxBr;
bool mUseTmmbr;
std::string mSpropParameterSets;
};

8
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
View File

@ -1059,9 +1059,13 @@ PeerConnectionImpl::ConfigureJsepSessionCodecs() {
}
videoCodec.mUseTmmbr = false;
// TMMBR is enabled from a pref in about:config
bool useTmmbr = false;
branch->GetBoolPref("media.navigator.video.use_tmmbr",
&videoCodec.mUseTmmbr);
&useTmmbr);
if (useTmmbr) {
videoCodec.EnableTmmbr();
}
}
break;
case SdpMediaSection::kText: