Integrate HTMLMediaElement with Web Audio API's MediaElementAudioSourceNode

webkit/media/webmediaplayer_impl.h

 // 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.
 
 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
 // It contains PipelineImpl which is the actual media player pipeline, it glues
 // the media player pipeline, data source, audio renderer and renderer.
 // PipelineImpl would creates multiple threads and access some public methods
 // of this class, so we need to be extra careful about concurrent access of
 // methods and members.
@@ skipping 37 matching lines @@
 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "media/base/filters.h"
 #include "media/base/message_loop_factory.h"
 #include "media/base/pipeline.h"
+#include "media/filters/audio_renderer_sink.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 
+class RenderAudioSourceProvider;
+
 namespace WebKit {
+class WebAudioSourceProvider;
+class WebAudioSourceProviderClient;
 class WebFrame;
 }
 
 namespace media {
 class MediaLog;
 }
 
 namespace webkit_media {
 
 class MediaStreamClient;
@@ skipping 23 matching lines @@
   // provided by WebKit to perform renderering. The simple data source does
   // resource loading by loading the whole resource object into memory. Null
   // audio renderer is a fake audio device that plays silence. Provider of the
   // |collection| can override the default filters by adding extra filters to
   // |collection| before calling this method.
   //
   // Callers must call |Initialize()| before they can use the object.
   WebMediaPlayerImpl(WebKit::WebMediaPlayerClient* client,
                      base::WeakPtr<WebMediaPlayerDelegate> delegate,
                      media::FilterCollection* collection,
+                     media::AudioRendererSink::RenderCallback* render_callback,
                      media::MessageLoopFactory* message_loop_factory,
                      MediaStreamClient* media_stream_client,
                      media::MediaLog* media_log);
   virtual ~WebMediaPlayerImpl();
 
   // Finalizes initialization of the object.
   bool Initialize(WebKit::WebFrame* frame, bool use_simple_data_source);
 
   virtual void load(const WebKit::WebURL& url);
   virtual void cancelLoad();
@@ skipping 49 matching lines @@
   virtual float mediaTimeForTimeValue(float timeValue) const;
 
   virtual unsigned decodedFrameCount() const;
   virtual unsigned droppedFrameCount() const;
   virtual unsigned audioDecodedByteCount() const;
   virtual unsigned videoDecodedByteCount() const;
 
   virtual WebKit::WebVideoFrame* getCurrentFrame();
   virtual void putCurrentFrame(WebKit::WebVideoFrame* web_video_frame);
 
+  virtual WebKit::WebAudioSourceProvider* audioSourceProvider();
+  scoped_refptr<RenderAudioSourceProvider> audio_source_provider_;

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

make member variables private.

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

Done.

+  media::AudioRendererSink::RenderCallback* audio_sink_render_callback_;
+
   virtual bool sourceAppend(const unsigned char* data, unsigned length);
   virtual void sourceEndOfStream(EndOfStreamStatus status);
 
   // As we are closing the tab or even the browser, |main_loop_| is destroyed
   // even before this object gets destructed, so we need to know when
   // |main_loop_| is being destroyed and we can stop posting repaint task
   // to it.
   virtual void WillDestroyCurrentMessageLoop() OVERRIDE;
 
   void Repaint();
@@ skipping 78 matching lines @@
   bool is_accelerated_compositing_active_;
 
   bool incremented_externally_allocated_memory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_