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

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

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years 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
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 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 // instead of content/renderer/, see http://crbug.com/136442 113 // instead of content/renderer/, see http://crbug.com/136442
114 114
115 WebMediaPlayerImpl(WebKit::WebFrame* frame, 115 WebMediaPlayerImpl(WebKit::WebFrame* frame,
116 WebKit::WebMediaPlayerClient* client, 116 WebKit::WebMediaPlayerClient* client,
117 base::WeakPtr<WebMediaPlayerDelegate> delegate, 117 base::WeakPtr<WebMediaPlayerDelegate> delegate,
118 media::FilterCollection* collection, 118 media::FilterCollection* collection,
119 WebKit::WebAudioSourceProvider* audio_source_provider, 119 WebKit::WebAudioSourceProvider* audio_source_provider,
120 media::AudioRendererSink* audio_renderer_sink, 120 media::AudioRendererSink* audio_renderer_sink,
121 media::MessageLoopFactory* message_loop_factory, 121 media::MessageLoopFactory* message_loop_factory,
122 MediaStreamClient* media_stream_client, 122 MediaStreamClient* media_stream_client,
123 bool encrypted_media_enabled,
123 media::MediaLog* media_log); 124 media::MediaLog* media_log);
124 virtual ~WebMediaPlayerImpl(); 125 virtual ~WebMediaPlayerImpl();
125 126
126 virtual void load(const WebKit::WebURL& url, CORSMode cors_mode); 127 virtual void load(const WebKit::WebURL& url, CORSMode cors_mode);
127 virtual void cancelLoad(); 128 virtual void cancelLoad();
128 129
129 // Playback controls. 130 // Playback controls.
130 virtual void play(); 131 virtual void play();
131 virtual void pause(); 132 virtual void pause();
132 virtual bool supportsFullscreen() const; 133 virtual bool supportsFullscreen() const;
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 bool incremented_externally_allocated_memory_; 353 bool incremented_externally_allocated_memory_;
353 354
354 WebKit::WebAudioSourceProvider* audio_source_provider_; 355 WebKit::WebAudioSourceProvider* audio_source_provider_;
355 356
356 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_; 357 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
357 358
358 bool is_local_source_; 359 bool is_local_source_;
359 bool supports_save_; 360 bool supports_save_;
360 361
361 // The decryptor that manages decryption keys and decrypts encrypted frames. 362 // The decryptor that manages decryption keys and decrypts encrypted frames.
362 ProxyDecryptor decryptor_; 363 scoped_ptr<ProxyDecryptor> decryptor_;
363 364
364 bool starting_; 365 bool starting_;
365 366
366 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 367 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
367 368
368 // Temporary for EME v0.1. In the future the init data type should be passed 369 // Temporary for EME v0.1. In the future the init data type should be passed
369 // through GenerateKeyRequest() directly from WebKit. 370 // through GenerateKeyRequest() directly from WebKit.
370 std::string init_data_type_; 371 std::string init_data_type_;
371 372
372 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 373 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
373 }; 374 };
374 375
375 } // namespace webkit_media 376 } // namespace webkit_media
376 377
377 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 378 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698