From cfd88bbe80c41a4ec3d1eb529f60e06e8bad3de8 Mon Sep 17 00:00:00 2001
From: "elad.alon" <elad.alon@webrtc.org>
Date: Tue, 14 Mar 2017 02:50:46 -0700
Subject: [PATCH] Fix AudioEncoderOpus::RecreateEncoderInstance() referring to
 old config_

BUG=webrtc:7334

Review-Url: https://codereview.webrtc.org/2742383002
Cr-Commit-Position: refs/heads/master@{#17222}
---
 webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
index 75655bb015..bac963f4e8 100644
--- a/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
+++ b/webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc
@@ -448,6 +448,7 @@ size_t AudioEncoderOpus::SufficientOutputBufferSize() const {
 bool AudioEncoderOpus::RecreateEncoderInstance(const Config& config) {
   if (!config.IsOk())
     return false;
+  config_ = config;
   if (inst_)
     RTC_CHECK_EQ(0, WebRtcOpus_EncoderFree(inst_));
   input_buffer_.clear();
@@ -474,7 +475,6 @@ bool AudioEncoderOpus::RecreateEncoderInstance(const Config& config) {
   RTC_CHECK_EQ(0,
                WebRtcOpus_SetPacketLossRate(
                    inst_, static_cast<int32_t>(packet_loss_rate_ * 100 + .5)));
-  config_ = config;
 
   num_channels_to_encode_ = NumChannels();
   next_frame_length_ms_ = config_.frame_size_ms;