commit 2d25b44f470afdd56513b75d641166f6e7cdcd04
author changbin.shao@webrtc.org <changbin.shao@webrtc.org> Mon Mar 16 04:14:34 2015
committer changbin.shao@webrtc.org <changbin.shao@webrtc.org> Mon Mar 16 04:15:23 2015
tree 41169b3b22413964a875c69bcd5ec610d4e8f6f1
parent eb44fd6e819f18e8be37b3bd117ff16181a514fc

Check associated payload type when negotiate RTX codecs.

At the moment, only payload name is checked when match two RTX codecs.
This will cause wrong behavior of codec negotiation if multiple RTX codecs
are added.

BUG=
R=pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/34189004

Cr-Commit-Position: refs/heads/master@{#8727}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8727 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/app/webrtc/webrtcsdp.cc

diff --git a/talk/app/webrtc/webrtcsdp.cc b/talk/app/webrtc/webrtcsdp.cc
index b2b33fa..be1fe47 100644
--- a/talk/app/webrtc/webrtcsdp.cc
+++ b/talk/app/webrtc/webrtcsdp.cc
@@ -2380,18 +2380,14 @@
 }
 
 // Gets the current codec setting associated with |payload_type|. If there
-// is no AudioCodec associated with that payload type it returns an empty codec
+// is no Codec associated with that payload type it returns an empty codec
 // with that payload type.
 template <class T>
-T GetCodec(const std::vector<T>& codecs, int payload_type) {
-  for (typename std::vector<T>::const_iterator codec = codecs.begin();
-       codec != codecs.end(); ++codec) {
-    if (codec->id == payload_type) {
-      return *codec;
-    }
+T GetCodecWithPayloadType(const std::vector<T>& codecs, int payload_type) {
+  T ret_val;
+  if (!FindCodecById(codecs, payload_type, &ret_val)) {
+    ret_val.id = payload_type;
   }
-  T ret_val = T();
-  ret_val.id = payload_type;
   return ret_val;
 }
 
@@ -2423,7 +2419,8 @@
 void UpdateCodec(MediaContentDescription* content_desc, int payload_type,
                  const cricket::CodecParameterMap& parameters) {
   // Codec might already have been populated (from rtpmap).
-  U new_codec = GetCodec(static_cast<T*>(content_desc)->codecs(), payload_type);
+  U new_codec = GetCodecWithPayloadType(static_cast<T*>(content_desc)->codecs(),
+                                        payload_type);
   AddParameters(parameters, &new_codec);
   AddOrReplaceCodec<T, U>(content_desc, new_codec);
 }
@@ -2434,7 +2431,8 @@
 void UpdateCodec(MediaContentDescription* content_desc, int payload_type,
                  const cricket::FeedbackParam& feedback_param) {
   // Codec might already have been populated (from rtpmap).
-  U new_codec = GetCodec(static_cast<T*>(content_desc)->codecs(), payload_type);
+  U new_codec = GetCodecWithPayloadType(static_cast<T*>(content_desc)->codecs(),
+                                        payload_type);
   AddFeedbackParameter(feedback_param, &new_codec);
   AddOrReplaceCodec<T, U>(content_desc, new_codec);
 }
@@ -2889,7 +2887,8 @@
                  AudioContentDescription* audio_desc) {
   // Codec may already be populated with (only) optional parameters
   // (from an fmtp).
-  cricket::AudioCodec codec = GetCodec(audio_desc->codecs(), payload_type);
+  cricket::AudioCodec codec =
+      GetCodecWithPayloadType(audio_desc->codecs(), payload_type);
   codec.name = name;
   codec.clockrate = clockrate;
   codec.bitrate = bitrate;
@@ -2906,7 +2905,8 @@
                  VideoContentDescription* video_desc) {
   // Codec may already be populated with (only) optional parameters
   // (from an fmtp).
-  cricket::VideoCodec codec = GetCodec(video_desc->codecs(), payload_type);
+  cricket::VideoCodec codec =
+      GetCodecWithPayloadType(video_desc->codecs(), payload_type);
   codec.name = name;
   codec.width = width;
   codec.height = height;