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

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: fix tests 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
« no previous file with comments | « webkit/media/filter_helpers.cc ('k') | 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 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
352 bool incremented_externally_allocated_memory_; 352 bool incremented_externally_allocated_memory_;
353 353
354 WebKit::WebAudioSourceProvider* audio_source_provider_; 354 WebKit::WebAudioSourceProvider* audio_source_provider_;
355 355
356 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_; 356 scoped_refptr<media::AudioRendererSink> audio_renderer_sink_;
357 357
358 bool is_local_source_; 358 bool is_local_source_;
359 bool supports_save_; 359 bool supports_save_;
360 360
361 // The decryptor that manages decryption keys and decrypts encrypted frames. 361 // The decryptor that manages decryption keys and decrypts encrypted frames.
362 ProxyDecryptor decryptor_; 362 scoped_ptr<ProxyDecryptor> decryptor_;
363 363
364 bool starting_; 364 bool starting_;
365 365
366 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_; 366 scoped_refptr<media::ChunkDemuxer> chunk_demuxer_;
367 367
368 // Temporary for EME v0.1. In the future the init data type should be passed 368 // Temporary for EME v0.1. In the future the init data type should be passed
369 // through GenerateKeyRequest() directly from WebKit. 369 // through GenerateKeyRequest() directly from WebKit.
370 std::string init_data_type_; 370 std::string init_data_type_;
371 371
372 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 372 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
373 }; 373 };
374 374
375 } // namespace webkit_media 375 } // namespace webkit_media
376 376
377 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 377 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW
« no previous file with comments | « webkit/media/filter_helpers.cc ('k') | webkit/media/webmediaplayer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698