Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode

content/renderer/render_view_impl.cc

 // Copyright (c) 2011 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/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <vector>
@@ skipping 1921 matching lines @@
   FOR_EACH_OBSERVER(
       RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
 
   media::MessageLoopFactory* message_loop_factory =
       new media::MessageLoopFactoryImpl();
   media::FilterCollection* collection = new media::FilterCollection();
   RenderMediaLog* render_media_log = new RenderMediaLog();
 
   // Add in any custom filter factories first.
   const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+
+  AudioRendererImpl* audio_renderer = NULL;
   if (!cmd_line->HasSwitch(switches::kDisableAudio)) {
     // Add the chrome specific audio renderer.
-    collection->AddAudioRenderer(new AudioRendererImpl());
+    // collection->AddAudioRenderer(new AudioRendererImpl());

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

remove this?

[Chris Rogers, 2011/12/19 21:40:35]

Done.

+    audio_renderer = new AudioRendererImpl( /*MessageLoop::current()*/ );

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

remove /**/ bit?

[Chris Rogers, 2011/12/19 21:40:35]

Done.

+    collection->AddAudioRenderer(audio_renderer);
   }
 
 #if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
   // Currently only cros/arm has any HW video decode support in
   // GpuVideoDecodeAccelerator so we don't even try to use it on other
   // platforms.  This is a startup-time optimization.  When new VDA
   // implementations are added, relax the #if above.
   WebKit::WebGraphicsContext3D* wk_context3d = webview()->graphicsContext3D();
   if (wk_context3d) {
     WebGraphicsContext3DCommandBufferImpl* context3d =
         static_cast<WebGraphicsContext3DCommandBufferImpl*>(wk_context3d);
     GpuChannelHost* gpu_channel_host =
         RenderThreadImpl::current()->EstablishGpuChannelSync(
             content::CAUSE_FOR_GPU_LAUNCH_VIDEODECODEACCELERATOR_INITIALIZE);
     collection->AddVideoDecoder(new media::GpuVideoDecoder(
         MessageLoop::current(),
         new RendererGpuVideoDecoderFactories(
             gpu_channel_host, context3d->context()->AsWeakPtr())));
   }
 #endif
 
+  // scoped_ptr<webkit_glue::WebMediaPlayerImpl> result(

[tommi (sloooow) - chröme, 2011/12/19 15:26:24]

remove?

[Chris Rogers, 2011/12/19 21:40:35]

Done.

+  //     new webkit_glue::WebMediaPlayerImpl(client,
+  //                                         AsWeakPtr(),
+  //                                         collection.release(),
+  //                                         audio_renderer,
+  //                                         message_loop_factory.release(),
+  //                                         media_stream_impl_.get(),
+  //                                         new RenderMediaLog()));
   webkit_media::WebMediaPlayerImpl* result_ptr;
   if (!content::GetContentClient()->renderer()->OverrideCreateWebMediaPlayer(
       this, client, AsWeakPtr(), collection, message_loop_factory,
       media_stream_impl_.get(), render_media_log, &result_ptr)) {
     result_ptr = new webkit_media::WebMediaPlayerImpl(
-        client, AsWeakPtr(), collection, message_loop_factory,
+        client, AsWeakPtr(), collection, audio_renderer, message_loop_factory,
         media_stream_impl_.get(), render_media_log);
   }
 
   DCHECK(result_ptr);
   scoped_ptr<webkit_media::WebMediaPlayerImpl> result;
   result.reset(result_ptr);
 
   if (!result->Initialize(frame,
                           cmd_line->HasSwitch(switches::kSimpleDataSource))) {
     return NULL;
@@ skipping 2821 matching lines @@
 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
   return !!RenderThreadImpl::current()->compositor_thread();
 }
 
 void RenderViewImpl::OnJavaBridgeInit() {
   DCHECK(!java_bridge_dispatcher_.get());
 #if defined(ENABLE_JAVA_BRIDGE)
   java_bridge_dispatcher_.reset(new JavaBridgeDispatcher(this));
 #endif
 }