From bfab5cbc33f21eccdd8e320ca44201ad6711f542 Mon Sep 17 00:00:00 2001
From: Peter Thatcher <pthatcher@chromium.org>
Date: Thu, 20 Aug 2015 17:40:24 -0700
Subject: [PATCH] Fix some minor errors with the voice engine caused by the
 refactor CL https://codereview.webrtc.org/1229283003/.

R=deadbeef@webrtc.org, solenberg@webrtc.org

Review URL: https://codereview.webrtc.org/1284693003 .

Cr-Commit-Position: refs/heads/master@{#9750}
---
 talk/session/media/channel.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/talk/session/media/channel.cc b/talk/session/media/channel.cc
index 5eec47cc4e..f65579f98b 100644
--- a/talk/session/media/channel.cc
+++ b/talk/session/media/channel.cc
@@ -1475,7 +1475,7 @@ bool VoiceChannel::SetLocalContent_w(const MediaContentDescription* content,
   AudioRecvParameters recv_params = last_recv_params_;
   RtpParametersFromMediaDescription(audio, &recv_params);
   if (!media_channel()->SetRecvParameters(recv_params)) {
-    SafeSetError("Failed to set local video description recv parameters.",
+    SafeSetError("Failed to set local audio description recv parameters.",
                  error_desc);
     return false;
   }
@@ -1540,6 +1540,10 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
     return false;
   }
 
+  if (audio->rtp_header_extensions_set()) {
+    MaybeCacheRtpAbsSendTimeHeaderExtension(audio->rtp_header_extensions());
+  }
+
   set_remote_content_direction(content->direction());
   ChangeState();
   return true;