Bug 1449042: Negotiate tracks even when they're not active. r?drno
MozReview-Commit-ID: CBhwHgjt1gf
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -1090,35 +1090,31 @@ JsepSessionImpl::MakeNegotiatedTransceiv
nsresult rv = FinalizeTransport(
remote.GetAttributeList(),
answer.GetAttributeList(),
transceiver->mTransport);
NS_ENSURE_SUCCESS(rv, rv);
}
transceiver->mSendTrack.SetActive(sending);
- if (sending) {
- transceiver->mSendTrack.Negotiate(answer, remote);
- }
+ transceiver->mSendTrack.Negotiate(answer, remote);
JsepTrack& recvTrack = transceiver->mRecvTrack;
recvTrack.SetActive(receiving);
- if (receiving) {
- recvTrack.Negotiate(answer, remote);
+ recvTrack.Negotiate(answer, remote);
- if (transceiver->HasBundleLevel() &&
- recvTrack.GetSsrcs().empty() &&
- recvTrack.GetMediaType() != SdpMediaSection::kApplication) {
- // TODO(bug 1105005): Once we have urn:ietf:params:rtp-hdrext:sdes:mid
- // support, we should only fire this warning if that extension was not
- // negotiated.
- MOZ_MTLOG(ML_ERROR, "[" << mName << "]: Bundled m-section has no ssrc "
- "attributes. This may cause media packets to be "
- "dropped.");
- }
+ if (transceiver->HasBundleLevel() &&
+ recvTrack.GetSsrcs().empty() &&
+ recvTrack.GetMediaType() != SdpMediaSection::kApplication) {
+ // TODO(bug 1105005): Once we have urn:ietf:params:rtp-hdrext:sdes:mid
+ // support, we should only fire this warning if that extension was not
+ // negotiated.
+ MOZ_MTLOG(ML_ERROR, "[" << mName << "]: Bundled m-section has no ssrc "
+ "attributes. This may cause media packets to be "
+ "dropped.");
}
if (transceiver->mTransport->mComponents == 2) {
// RTCP MUX or not.
// TODO(bug 1095743): verify that the PTs are consistent with mux.
MOZ_MTLOG(ML_DEBUG, "[" << mName << "]: RTCP-MUX is off");
}