Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-11 14:28:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1328142 - fix bug in VideoConduit::SetRemoteSSRC handling r=jesup

Browse Source
This commit is contained in:
Paul Kerr [:pkerr] 2017-01-05 18:15:07 -08:00
parent c63cea9af7
commit ca7b17b7b1
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
View File

@ -1114,8 +1114,8 @@ WebrtcVideoConduit::ConfigureRecvMediaCodecs(
mRecvStreamConfig.rtp.tmmbr != use_tmmbr ||
mRecvStreamConfig.rtp.keyframe_method != kf_request_method ||
(use_fec &&
mRecvStreamConfig.rtp.fec.ulpfec_payload_type != ulpfec_payload_type ||
mRecvStreamConfig.rtp.fec.red_payload_type != red_payload_type)) {
(mRecvStreamConfig.rtp.fec.ulpfec_payload_type != ulpfec_payload_type ||
mRecvStreamConfig.rtp.fec.red_payload_type != red_payload_type))) {
condError = StopReceiving();
if (condError != kMediaConduitNoError) {
@ -1149,8 +1149,7 @@ WebrtcVideoConduit::ConfigureRecvMediaCodecs(
}
} while (ssrc == mRecvStreamConfig.rtp.remote_ssrc);
//DEBUG(pkerr) mRecvStreamConfig.rtp.local_ssrc = ssrc;
mRecvStreamConfig.rtp.local_ssrc = 1;
mRecvStreamConfig.rtp.local_ssrc = ssrc;
// XXX Copy over those that are the same and don't rebuild them
mRecvCodecList.SwapElements(recv_codecs);

2
media/webrtc/signaling/src/media-conduit/VideoConduit.h
View File

@ -469,8 +469,8 @@ private:
int mMinBitrate;
int mStartBitrate;
int mPrefMaxBitrate;
int mMinBitrateEstimate;
int mNegotiatedMaxBitrate;
int mMinBitrateEstimate;
bool mRtpStreamIdEnabled;
uint8_t mRtpStreamIdExtId;