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

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

Issue 10535029: Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Updated encrypted WebM test data. Created 8 years, 6 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
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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h" 63 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient. h"
64 64
65 class RenderAudioSourceProvider; 65 class RenderAudioSourceProvider;
66 66
67 namespace WebKit { 67 namespace WebKit {
68 class WebAudioSourceProvider; 68 class WebAudioSourceProvider;
69 class WebFrame; 69 class WebFrame;
70 } 70 }
71 71
72 namespace media { 72 namespace media {
73 class AesDecryptor; 73 class HmacAesDecryptor;
74 class MediaLog; 74 class MediaLog;
75 } 75 }
76 76
77 namespace webkit_media { 77 namespace webkit_media {
78 78
79 class MediaStreamClient; 79 class MediaStreamClient;
80 class WebMediaPlayerDelegate; 80 class WebMediaPlayerDelegate;
81 class WebMediaPlayerProxy; 81 class WebMediaPlayerProxy;
82 82
83 class WebMediaPlayerImpl 83 class WebMediaPlayerImpl
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 270
271 // The media pipeline and a bool tracking whether we have started it yet. 271 // The media pipeline and a bool tracking whether we have started it yet.
272 // 272 //
273 // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and 273 // TODO(scherkus): replace |started_| with a pointer check for |pipeline_| and
274 // have WebMediaPlayerImpl return the default values to WebKit instead of 274 // have WebMediaPlayerImpl return the default values to WebKit instead of
275 // relying on Pipeline to take care of default values. 275 // relying on Pipeline to take care of default values.
276 scoped_refptr<media::Pipeline> pipeline_; 276 scoped_refptr<media::Pipeline> pipeline_;
277 bool started_; 277 bool started_;
278 278
279 // The decryptor that manages decryption keys and decrypts encrypted frames. 279 // The decryptor that manages decryption keys and decrypts encrypted frames.
280 scoped_ptr<media::AesDecryptor> decryptor_; 280 scoped_ptr<media::HmacAesDecryptor> decryptor_;
281 281
282 scoped_ptr<media::MessageLoopFactory> message_loop_factory_; 282 scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
283 283
284 // Playback state. 284 // Playback state.
285 // 285 //
286 // TODO(scherkus): we have these because Pipeline favours the simplicity of a 286 // TODO(scherkus): we have these because Pipeline favours the simplicity of a
287 // single "playback rate" over worrying about paused/stopped etc... It forces 287 // single "playback rate" over worrying about paused/stopped etc... It forces
288 // all clients to manage the pause+playback rate externally, but is that 288 // all clients to manage the pause+playback rate externally, but is that
289 // really a bad thing? 289 // really a bad thing?
290 // 290 //
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 WebKit::WebAudioSourceProvider* audio_source_provider_; 322 WebKit::WebAudioSourceProvider* audio_source_provider_;
323 323
324 bool is_local_source_; 324 bool is_local_source_;
325 325
326 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl); 326 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerImpl);
327 }; 327 };
328 328
329 } // namespace webkit_media 329 } // namespace webkit_media
330 330
331 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_ 331 #endif // WEBKIT_MEDIA_WEBMEDIAPLAYER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698