Adding audio support to the new webmediaplyer

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"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_source_extra_data.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/rtc_video_decoder.h"
 #include "content/renderer/media/rtc_video_renderer.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
+#include "content/renderer/media/webrtc_audio_renderer.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "media/base/message_loop_factory.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaConstraints.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaStreamRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamComponent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h"
+#include "webkit/media/media_stream_audio_renderer.h"
 
 namespace {
 
 std::string GetMandatoryStreamConstraint(
     const WebKit::WebMediaConstraints& constraints, const std::string& key) {
   if (constraints.isNull())
     return std::string();
 
   WebKit::WebString value;
   constraints.getMandatoryConstraintValue(UTF8ToUTF16(key), value);
@@ skipping 208 matching lines @@
   DVLOG(1) << "MediaStreamImpl::GetVideoDecoder stream:"
            << UTF16ToUTF8(descriptor.label());
 
   webrtc::MediaStreamInterface* stream = GetNativeMediaStream(descriptor);
   if (stream)
     return CreateVideoDecoder(stream, message_loop_factory);
   NOTREACHED();
   return NULL;
 }
 
+scoped_refptr<webkit_media::MediaStreamAudioRenderer>
+MediaStreamImpl::GetAudioRenderer(const GURL& url) {
+  DCHECK(CalledOnValidThread());
+  WebKit::WebMediaStreamDescriptor descriptor(GetMediaStream(url));
+
+  if (descriptor.isNull() || !descriptor.extraData())
+    return NULL;  // This is not a valid stream.
+
+  DVLOG(1) << "MediaStreamImpl::GetAudioRenderer stream:"
+           << UTF16ToUTF8(descriptor.label());
+
+  MediaStreamExtraData* extra_data =
+      static_cast<MediaStreamExtraData*>(descriptor.extraData());
+  if (extra_data->remote_stream()) {
+    scoped_refptr<WebRtcAudioRenderer> renderer =
+        CreateRemoteAudioRenderer(extra_data->remote_stream());
+
+    if (dependency_factory_->GetWebRtcAudioDevice()->SetRenderer(renderer)) {
+      return renderer;
+    } else {

[scherkus (not reviewing), 2012/10/26 17:28:22]

nit: remove else

[no longer working on chromium, 2012/10/29 15:01:36]

Done.

+      // WebRtcAudioDeviceImpl can only support one renderer.
+      return NULL;
+    }
+  }
+
+  if (extra_data->local_stream()) {
+    // TODO(xians): Implement a WebRtcAudioFIFO to handle the local loopback.
+    return NULL;
+  }
+
+  NOTREACHED();
+  return NULL;
+}
+
 // Callback from MediaStreamDispatcher.
 // The requested stream have been generated.
 void MediaStreamImpl::OnStreamGenerated(
     int request_id,
     const std::string& label,
     const media_stream::StreamDeviceInfoArray& audio_array,
     const media_stream::StreamDeviceInfoArray& video_array) {
   DCHECK(CalledOnValidThread());
 
   WebKit::WebVector<WebKit::WebMediaStreamSource> audio_source_vector(
@@ skipping 199 matching lines @@
 
   DVLOG(1) << "MediaStreamImpl::CreateRemoteVideoDecoder label:"
            << stream->label();
 
   return new RTCVideoDecoder(
       message_loop_factory->GetMessageLoop(media::MessageLoopFactory::kDecoder),
       base::MessageLoopProxy::current(),
       stream->video_tracks()->at(0));
 }
 
+scoped_refptr<WebRtcAudioRenderer> MediaStreamImpl::CreateRemoteAudioRenderer(
+    webrtc::MediaStreamInterface* stream) {
+  if (!stream->audio_tracks() || stream->audio_tracks()->count() == 0)
+    return NULL;
+
+  DVLOG(1) << "MediaStreamImpl::CreateRemoteAudioRenderer label:"
+           << stream->label();
+
+  return new WebRtcAudioRenderer();
+}
+
 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
     const media_stream::StreamDeviceInfo& device_info)
     : device_info_(device_info) {
 }
 
 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {}
 
 MediaStreamExtraData::MediaStreamExtraData(
     webrtc::MediaStreamInterface* remote_stream)
     : remote_stream_(remote_stream) {
@@ skipping 11 matching lines @@
     const StreamStopCallback& stop_callback) {
   stream_stop_callback_ = stop_callback;
 }
 
 void MediaStreamExtraData::OnLocalStreamStop() {
   if (!stream_stop_callback_.is_null())
     stream_stop_callback_.Run(local_stream_->label());
 }
 
 }  // namespace content