Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Unified Diff: webkit/media/webmediaplayer_impl.h

Issue 10662030: WebMediaPlayerImpl needs to own the audio source provider. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Update according to review Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webkit/media/webmediaplayer_impl.h
diff --git a/webkit/media/webmediaplayer_impl.h b/webkit/media/webmediaplayer_impl.h
index 376c10f152816326b9e42245d03d1f6160a2be4c..9af7daa62691da7cc679bcb87a16abfaff5df1a2 100644
--- a/webkit/media/webmediaplayer_impl.h
+++ b/webkit/media/webmediaplayer_impl.h
@@ -75,6 +75,7 @@ class WebFrame;
}
namespace media {
+class AudioRendererSink;
class MediaLog;
}
@@ -104,11 +105,19 @@ class WebMediaPlayerImpl
// filter if they wish to hear any sound coming out the speakers, otherwise
// audio data is discarded and media plays back based on wall clock time.
//
+ // When calling this, the |audio_source_provider| and
+ // |audio_renderer_sink| arguments should be the same object.
+ //
+ // TODO(scherkus): Remove WebAudioSourceProvider parameter once we
+ // refactor RenderAudioSourceProvider to live under webkit/media/
+ // instead of content/renderer/, see http://crbug.com/136442
+
WebMediaPlayerImpl(WebKit::WebFrame* frame,
WebKit::WebMediaPlayerClient* client,
base::WeakPtr<WebMediaPlayerDelegate> delegate,
media::FilterCollection* collection,
WebKit::WebAudioSourceProvider* audio_source_provider,
+ media::AudioRendererSink* audio_renderer_sink,
media::MessageLoopFactory* message_loop_factory,
MediaStreamClient* media_stream_client,
media::MediaLog* media_log);
@@ -340,6 +349,8 @@ class WebMediaPlayerImpl
WebKit::WebAudioSourceProvider* audio_source_provider_;
+ scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
+
bool is_local_source_;
// The decryptor that manages decryption keys and decrypts encrypted frames.

Powered by Google App Engine
This is Rietveld 408576698