From 12b283cba1eeeb6ff989e06a2e61817affc5d34c Mon Sep 17 00:00:00 2001
From: "Byron Campen [:bwc]" <docfaraday@gmail.com>
Date: Fri, 5 Apr 2019 17:41:25 +0000
Subject: [PATCH] Bug 1288105 - Part 2: Fix longstanding bug where rollback
 could wipe out the codecs in a transceiver, that was being hidden by a bug
 fixed in part 1. r=mjf

Depends on D26238

Differential Revision: https://phabricator.services.mozilla.com/D26348

--HG--
extra : moz-landing-system : lando
---
 media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
index f57be3c34bd9..d55ac7a561b5 100644
--- a/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
+++ b/media/webrtc/signaling/src/jsep/JsepSessionImpl.cpp
@@ -1548,6 +1548,8 @@ void JsepSessionImpl::RollbackLocalOffer() {
 
     RefPtr<JsepTransceiver> temp(
         new JsepTransceiver(transceiver->GetMediaType()));
+    temp->mSendTrack.PopulateCodecs(mSupportedCodecs);
+    temp->mRecvTrack.PopulateCodecs(mSupportedCodecs);
     transceiver->Rollback(*temp);
   }
 
@@ -1570,6 +1572,8 @@ void JsepSessionImpl::RollbackRemoteOffer() {
     // up at the starting state.
     RefPtr<JsepTransceiver> temp(
         new JsepTransceiver(transceiver->GetMediaType()));
+    temp->mSendTrack.PopulateCodecs(mSupportedCodecs);
+    temp->mRecvTrack.PopulateCodecs(mSupportedCodecs);
     transceiver->Rollback(*temp);
 
     if (shouldRemove) {