Rolling libjingle revison r163.

content/renderer/media/media_stream_center.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/media_stream_center.h"
 
 #include <string>
 
 #include "base/logging.h"
+#include "base/string_number_conversions.h"

[wjia(left Chromium), 2012/07/30 18:19:10]

file order.

[Mallinath (Gone from Chromium), 2012/07/30 18:42:08]

Done.

 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/libjingle/source/talk/app/webrtc/jsep.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamCenterClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
@@ skipping 114 matching lines @@
   MediaStreamImpl* ms_impl = GetMediaStreamImpl(web_frame);
   if (ms_impl) {
     ms_impl->CreateMediaStream(web_frame, &stream);
     return;
   }
   NOTREACHED();
 }
 
 WebKit::WebString MediaStreamCenter::constructSDP(
     const WebKit::WebICECandidateDescriptor& candidate) {
+  int m_line_index = -1;
+  if (!base::StringToInt(UTF16ToUTF8(candidate.label()), &m_line_index)) {
+    LOG(ERROR) << "Invalid candidate label: " << UTF16ToUTF8(candidate.label());
+    return WebKit::WebString();
+  }
   scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
       webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
+                                 m_line_index,
                                  UTF16ToUTF8(candidate.candidateLine())));
   std::string sdp;
   if (!native_candidate->ToString(&sdp))
     LOG(ERROR) << "Could not create SDP string";
   return UTF8ToUTF16(sdp);
 }
 
 WebKit::WebString MediaStreamCenter::constructSDP(
     const WebKit::WebSessionDescriptionDescriptor& description) {
   scoped_ptr<webrtc::SessionDescriptionInterface> native_desc(
       webrtc::CreateSessionDescription(UTF16ToUTF8(description.initialSDP())));
   if (!native_desc.get())
     return WebKit::WebString();
 
   for (size_t i = 0; i < description.numberOfAddedCandidates(); ++i) {
     WebKit::WebICECandidateDescriptor candidate = description.candidate(i);
+    int m_line_index = -1;
+    if (!base::StringToInt(UTF16ToUTF8(candidate.label()), &m_line_index)) {
+      LOG(ERROR) << "Invalid candidate label: "
+                 << UTF16ToUTF8(candidate.label());
+      continue;
+    }
     scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
         webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
+                                   m_line_index,
                                    UTF16ToUTF8(candidate.candidateLine())));
     native_desc->AddCandidate(native_candidate.get());
   }
 
   std::string sdp;
   if (!native_desc->ToString(&sdp))
     LOG(ERROR) << "Could not create SDP string";
   return UTF8ToUTF16(sdp);
 }
 
 }  // namespace content