Use empty string as the mid before it's ready from WebKit. Label is not the correct mid, so we shou…

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/memory/scoped_ptr.h"
@@ skipping 129 matching lines @@
   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();
   }
+  // TODO(ronghuawu): Get sdp_mid from WebKit when is available.
+  const std::string sdp_mid = "";

[wjia(left Chromium), 2012/08/02 22:09:20]

std::string's default ctor make it an empty string.

[Ronghua Wu (Left Chromium), 2012/08/02 22:14:48]

Was thinking maybe it's easier to read - people won't think this is a mistake.
Probably doesn't matter.

Done.

   scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
-      webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
+      webrtc::CreateIceCandidate(sdp_mid,
                                  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;
     }
+    // TODO(ronghuawu): Get sdp_mid from WebKit when is available.
+    const std::string sdp_mid = "";

[wjia(left Chromium), 2012/08/02 22:09:20]

ditto.

[Ronghua Wu (Left Chromium), 2012/08/02 22:14:48]

Done.

     scoped_ptr<webrtc::IceCandidateInterface> native_candidate(
-        webrtc::CreateIceCandidate(UTF16ToUTF8(candidate.label()),
+        webrtc::CreateIceCandidate(sdp_mid,
                                    m_line_index,
                                    UTF16ToUTF8(candidate.candidateLine())));
-    native_desc->AddCandidate(native_candidate.get());
+    if (!native_desc->AddCandidate(native_candidate.get())) {
+      LOG(ERROR) << "Failed to add candidate to SessionDescription.";
+      continue;
+    }
   }
 
   std::string sdp;
   if (!native_desc->ToString(&sdp))
     LOG(ERROR) << "Could not create SDP string";
   return UTF8ToUTF16(sdp);
 }
 
 }  // namespace content