Rolling libjingle revison r163.

content/renderer/media/peer_connection_handler_jsep.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/peer_connection_handler_jsep.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
+#include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICECandidateDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebICEOptions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaHints.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamDescriptor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSessionDescriptionDescriptor.h"
@@ skipping 123 matching lines @@
     default:
       NOTREACHED();
       return false;
   }
   native_peer_connection_->StartIce(native_options);
   return true;
 }
 
 bool PeerConnectionHandlerJsep::processIceMessage(
     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 false;
+  }
+

[Ronghua Wu (Left Chromium), 2012/07/30 18:09:10]

// TODO: Set sdp_mid when mid is available in WebICECandidateDescriptor.
std::string sdp_mid;

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

Done.

   scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
       dependency_factory_->CreateIceCandidate(
-          UTF16ToUTF8(candidate.label()),
+          "",

[Ronghua Wu (Left Chromium), 2012/07/30 18:09:10]

use sdp_mid

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

Done.

+          m_line_index,
           UTF16ToUTF8(candidate.candidateLine())));
   if (!native_candidate.get()) {
     LOG(ERROR) << "Could not create native ICE candidate";
     return false;
   }
 
   bool return_value =
       native_peer_connection_->ProcessIceMessage(native_candidate.get());
   if (!return_value)
     LOG(ERROR) << "Error processing ICE message";
@@ skipping 103 matching lines @@
   WebKit::WebMediaStreamDescriptor descriptor = it->second;
   DCHECK(!descriptor.isNull());
   remote_streams_.erase(it);
   client_->didRemoveRemoteStream(descriptor);
 }
 
 void PeerConnectionHandlerJsep::OnIceCandidate(
     const webrtc::IceCandidateInterface* candidate) {
   WebKit::WebICECandidateDescriptor web_candidate;
 
-  std::string label = candidate->label();
+  std::string label = StringPrintf("%d", candidate->sdp_mline_index());
   std::string sdp;
   if (!candidate->ToString(&sdp)) {
     LOG(ERROR) << "Could not get SDP string";
     return;
   }
 
   web_candidate.initialize(UTF8ToUTF16(label), UTF8ToUTF16(sdp));
 
   // moreToFollow parameter isn't supported in native PeerConnection, so we
   // always use true here, and then false in OnIceComplete().
@@ skipping 13 matching lines @@
   std::string initial_sdp = UTF16ToUTF8(description.initialSDP());
   webrtc::SessionDescriptionInterface* native_desc =
       dependency_factory_->CreateSessionDescription(initial_sdp);
   if (!native_desc) {
     LOG(ERROR) << "Failed to create native session description";
     return NULL;
   }
 
   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(
         dependency_factory_->CreateIceCandidate(
-            UTF16ToUTF8(candidate.label()),
+            "",

[Ronghua Wu (Left Chromium), 2012/07/30 18:09:10]

dito

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

Done.

+            m_line_index,
             UTF16ToUTF8(candidate.candidateLine())));
     if (!native_desc->AddCandidate(native_candidate.get()))
       LOG(ERROR) << "Failed to add candidate to native session description";
   }
 
   return native_desc;
 }
 
 WebKit::WebSessionDescriptionDescriptor
 PeerConnectionHandlerJsep::CreateWebKitSessionDescription(
@@ skipping 26 matching lines @@
       break;
     case ActionSDPAnswer:
       *native_action = webrtc::PeerConnectionInterface::kAnswer;
       break;
     default:
       NOTREACHED();
       return false;
   }
   return true;
 }