Connect webrtc MediaSourceInterface ready states with webkit WebMediaStreamSource

content/renderer/media/media_stream_impl.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_impl.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
@@ skipping 72 matching lines @@
     const char* track_type =
         (type == WebKit::WebMediaStreamSource::TypeAudio) ? "a" : "v";
     std::string source_id = base::StringPrintf("%s%s%u", label.c_str(),
                                                track_type,
                                                static_cast<unsigned int>(i));
     webkit_sources[i].initialize(
           UTF8ToUTF16(source_id),
           type,
           UTF8ToUTF16(devices[i].device.name));
     webkit_sources[i].setExtraData(
-        new content::MediaStreamSourceExtraData(devices[i]));
+        new content::MediaStreamSourceExtraData(devices[i], webkit_sources[i]));
     webkit_sources[i].setDeviceId(UTF8ToUTF16(devices[i].device.id.c_str()));
   }
 }
 
 webrtc::MediaStreamInterface* GetNativeMediaStream(
     const WebKit::WebMediaStream& descriptor) {
   content::MediaStreamExtraData* extra_data =
       static_cast<content::MediaStreamExtraData*>(descriptor.extraData());
   if (!extra_data)
     return NULL;
@@ skipping 195 matching lines @@
     DVLOG(1) << "Request ID not found";
     return;
   }
   request_info->generated = true;
 
   WebKit::WebVector<WebKit::WebMediaStreamSource> audio_source_vector(
       audio_array.size());
   CreateWebKitSourceVector(label, audio_array,
                            WebKit::WebMediaStreamSource::TypeAudio,
                            audio_source_vector);
+  request_info->audio_sources.assign(audio_source_vector);
   WebKit::WebVector<WebKit::WebMediaStreamSource> video_source_vector(
       video_array.size());
   CreateWebKitSourceVector(label, video_array,
                            WebKit::WebMediaStreamSource::TypeVideo,
                            video_source_vector);
+  request_info->video_sources.assign(video_source_vector);
 
   WebKit::WebUserMediaRequest* request = &(request_info->request);
   WebKit::WebString webkit_label = UTF8ToUTF16(label);
   WebKit::WebMediaStream* description = &(request_info->descriptor);
 
   description->initialize(webkit_label, audio_source_vector,
                           video_source_vector);
 
   // WebUserMediaRequest don't have an implementation in unit tests.
   // Therefore we need to check for isNull here.
@@ skipping 229 matching lines @@
            << "audio_track.id     : " << audio_track->id()
            << "audio_track.enabled: " << audio_track->enabled();
 
   // Create a new WebRtcLocalAudioRenderer instance and connect it to the
   // existing WebRtcAudioCapturer so that the renderer can use it as source.
   return new WebRtcLocalAudioRenderer(source, audio_track,
                                       RenderViewObserver::routing_id());
 }
 
 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
-    const StreamDeviceInfo& device_info)
-    : device_info_(device_info) {
+    const StreamDeviceInfo& device_info,
+    const WebKit::WebMediaStreamSource& webkit_source)
+    : device_info_(device_info),
+      webkit_source_(webkit_source) {
 }
 
 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
     media::AudioCapturerSource* source)
     : audio_source_(source)  {
 }
 
 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {}
 
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* stream, bool is_local)
     : stream_(stream),
       is_local_(is_local) {
 }
 
 MediaStreamExtraData::~MediaStreamExtraData() {
 }
 
 void MediaStreamExtraData::SetLocalStreamStopCallback(
     const StreamStopCallback& stop_callback) {
   stream_stop_callback_ = stop_callback;
 }
 
 void MediaStreamExtraData::OnLocalStreamStop() {
   if (!stream_stop_callback_.is_null())
     stream_stop_callback_.Run(stream_->label());
 }
 
+MediaStreamImpl::UserMediaRequestInfo::UserMediaRequestInfo()
+    : request_id(0), generated(false), frame(NULL), request() {
+}
+
+MediaStreamImpl::UserMediaRequestInfo::UserMediaRequestInfo(
+    int request_id,
+    WebKit::WebFrame* frame,
+    const WebKit::WebUserMediaRequest& request)
+    : request_id(request_id), generated(false), frame(frame),
+      request(request) {
+}
+
+MediaStreamImpl::UserMediaRequestInfo::~UserMediaRequestInfo() {
+  // Release the extra data field of all sources created by
+  // MediaStreamImpl for this request. This breaks the circular reference to
+  // WebKit::MediaStreamSource.
+  // TODO(tommyw): Remove this once WebKit::MediaStreamSource::Owner has been
+  // implemented to fully avoid a circular dependency.
+  for (size_t i = 0; i < audio_sources.size(); ++i) {
+    audio_sources[i].setReadyState(
+        WebKit::WebMediaStreamSource::ReadyStateEnded);
+    audio_sources[i].setExtraData(NULL);
+  }
+
+  for (size_t i = 0; i < video_sources.size(); ++i) {
+    video_sources[i].setReadyState(
+            WebKit::WebMediaStreamSource::ReadyStateEnded);
+    video_sources[i].setExtraData(NULL);
+  }
+}
+
 }  // namespace content