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

Side by Side Diff: webkit/media/webmediaplayer_impl.h

Issue 11779045: Have WebMediaPlayerImpl maintain a reference to AudioRendererSink. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player. 5 // Delegate calls from WebCore::MediaPlayerPrivate to Chrome's video player.
6 // It contains Pipeline which is the actual media player pipeline, it glues 6 // It contains Pipeline which is the actual media player pipeline, it glues
7 // the media player pipeline, data source, audio renderer and renderer. 7 // the media player pipeline, data source, audio renderer and renderer.
8 // Pipeline would creates multiple threads and access some public methods 8 // Pipeline would creates multiple threads and access some public methods
9 // of this class, so we need to be extra careful about concurrent access of 9 // of this class, so we need to be extra careful about concurrent access of
10 // methods and members. 10 // methods and members.
(...skipping 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 MediaStreamClient* media_stream_client_; 318 MediaStreamClient* media_stream_client_;
319 319
320 scoped_refptr<media::MediaLog> media_log_; 320 scoped_refptr<media::MediaLog> media_log_;
321 321
322 // Since accelerated compositing status is only known after the first layout, 322 // Since accelerated compositing status is only known after the first layout,
323 // we delay reporting it to UMA until that time. 323 // we delay reporting it to UMA until that time.
324 bool accelerated_compositing_reported_; 324 bool accelerated_compositing_reported_;
325 325
326 bool incremented_externally_allocated_memory_; 326 bool incremented_externally_allocated_memory_;
327 327
328 // TODO(scherkus): Sadly these two objects are the same and we're also forced
329 // to maintain an additional reference to |audio_renderer_sink_| otherwise
330 // |audio_source_provider_| will go bad after |pipeline_| shuts down.
331 //
332 // See http://crbug.com/136442 for details.
328 WebKit::WebAudioSourceProvider* audio_source_provider_; 333 WebKit::WebAudioSourceProvider* audio_source_provider_;
334 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
329 335
330 bool is_local_source_; 336 bool is_local_source_;
331 bool supports_save_; 337 bool supports_save_;
332 338
333 // The decryptor that manages decryption keys and decrypts encrypted frames. 339 // The decryptor that manages decryption keys and decrypts encrypted frames.
334 scoped_ptr<ProxyDecryptor> decryptor_; 340 scoped_ptr<ProxyDecryptor> decryptor_;
335 341
336 bool starting_; 342 bool starting_;
337 343
338 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 344 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
339 345
340 // Temporary for EME v0.1. In the future the init data type should be passed 346 // Temporary for EME v0.1. In the future the init data type should be passed
341 // through GenerateKeyRequest() directly from WebKit. 347 // through GenerateKeyRequest() directly from WebKit.
342 std::string init_data_type_; 348 std::string init_data_type_;
343 349
344 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 350 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
345 }; 351 };
346 352
347 } // namespace webkit_media 353 } // namespace webkit_media
348 354
349 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 355 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698