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

Side by Side Diff: webkit/media/crypto/ppapi_decryptor.h

Issue 12638030: Make AudioDecoderConfig copyable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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 | « media/webm/webm_stream_parser.cc ('k') | webkit/media/crypto/ppapi_decryptor.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 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 5 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 6 #define WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 int init_data_length, 50 int init_data_length,
51 const std::string& session_id) OVERRIDE; 51 const std::string& session_id) OVERRIDE;
52 virtual void CancelKeyRequest(const std::string& key_system, 52 virtual void CancelKeyRequest(const std::string& key_system,
53 const std::string& session_id) OVERRIDE; 53 const std::string& session_id) OVERRIDE;
54 virtual void RegisterNewKeyCB(StreamType stream_type, 54 virtual void RegisterNewKeyCB(StreamType stream_type,
55 const NewKeyCB& key_added_cb) OVERRIDE; 55 const NewKeyCB& key_added_cb) OVERRIDE;
56 virtual void Decrypt(StreamType stream_type, 56 virtual void Decrypt(StreamType stream_type,
57 const scoped_refptr<media::DecoderBuffer>& encrypted, 57 const scoped_refptr<media::DecoderBuffer>& encrypted,
58 const DecryptCB& decrypt_cb) OVERRIDE; 58 const DecryptCB& decrypt_cb) OVERRIDE;
59 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE; 59 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;
60 virtual void InitializeAudioDecoder( 60 virtual void InitializeAudioDecoder(const media::AudioDecoderConfig& config,
61 scoped_ptr<media::AudioDecoderConfig> config, 61 const DecoderInitCB& init_cb) OVERRIDE;
62 const DecoderInitCB& init_cb) OVERRIDE;
63 virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config, 62 virtual void InitializeVideoDecoder(const media::VideoDecoderConfig& config,
64 const DecoderInitCB& init_cb) OVERRIDE; 63 const DecoderInitCB& init_cb) OVERRIDE;
65 virtual void DecryptAndDecodeAudio( 64 virtual void DecryptAndDecodeAudio(
66 const scoped_refptr<media::DecoderBuffer>& encrypted, 65 const scoped_refptr<media::DecoderBuffer>& encrypted,
67 const AudioDecodeCB& audio_decode_cb) OVERRIDE; 66 const AudioDecodeCB& audio_decode_cb) OVERRIDE;
68 virtual void DecryptAndDecodeVideo( 67 virtual void DecryptAndDecodeVideo(
69 const scoped_refptr<media::DecoderBuffer>& encrypted, 68 const scoped_refptr<media::DecoderBuffer>& encrypted,
70 const VideoDecodeCB& video_decode_cb) OVERRIDE; 69 const VideoDecodeCB& video_decode_cb) OVERRIDE;
71 virtual void ResetDecoder(StreamType stream_type) OVERRIDE; 70 virtual void ResetDecoder(StreamType stream_type) OVERRIDE;
72 virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE; 71 virtual void DeinitializeDecoder(StreamType stream_type) OVERRIDE;
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 113
115 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_; 114 base::WeakPtrFactory<PpapiDecryptor> weak_ptr_factory_;
116 base::WeakPtr<PpapiDecryptor> weak_this_; 115 base::WeakPtr<PpapiDecryptor> weak_this_;
117 116
118 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor); 117 DISALLOW_COPY_AND_ASSIGN(PpapiDecryptor);
119 }; 118 };
120 119
121 } // namespace webkit_media 120 } // namespace webkit_media
122 121
123 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_ 122 #endif // WEBKIT_MEDIA_CRYPTO_PPAPI_DECRYPTOR_H_
OLDNEW
« no previous file with comments | « media/webm/webm_stream_parser.cc ('k') | webkit/media/crypto/ppapi_decryptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698