media/crypto/aes_decryptor.h - Issue 12638030: Make AudioDecoderConfig copyable.

Side by Side Diff: media/crypto/aes_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/base/mock_filters.cc ('k') | media/crypto/aes_decryptor.cc » ('j') | no next file with comments »

OLD	NEW
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 MEDIA_CRYPTO_AES_DECRYPTOR_H_	5 #ifndef MEDIA_CRYPTO_AES_DECRYPTOR_H_

6 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_	6 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_

7	7

8 #include <string>	8 #include <string>

9	9

10 #include "base/basictypes.h"	10 #include "base/basictypes.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 int init_data_length,	44 int init_data_length,

45 const std::string& session_id) OVERRIDE;	45 const std::string& session_id) OVERRIDE;

46 virtual void CancelKeyRequest(const std::string& key_system,	46 virtual void CancelKeyRequest(const std::string& key_system,

47 const std::string& session_id) OVERRIDE;	47 const std::string& session_id) OVERRIDE;

48 virtual void RegisterNewKeyCB(StreamType stream_type,	48 virtual void RegisterNewKeyCB(StreamType stream_type,

49 const NewKeyCB& key_added_cb) OVERRIDE;	49 const NewKeyCB& key_added_cb) OVERRIDE;

50 virtual void Decrypt(StreamType stream_type,	50 virtual void Decrypt(StreamType stream_type,

51 const scoped_refptr<DecoderBuffer>& encrypted,	51 const scoped_refptr<DecoderBuffer>& encrypted,

52 const DecryptCB& decrypt_cb) OVERRIDE;	52 const DecryptCB& decrypt_cb) OVERRIDE;

53 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;	53 virtual void CancelDecrypt(StreamType stream_type) OVERRIDE;

54 virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,	54 virtual void InitializeAudioDecoder(const AudioDecoderConfig& config,

55 const DecoderInitCB& init_cb) OVERRIDE;	55 const DecoderInitCB& init_cb) OVERRIDE;

56 virtual void InitializeVideoDecoder(const VideoDecoderConfig& config,	56 virtual void InitializeVideoDecoder(const VideoDecoderConfig& config,

57 const DecoderInitCB& init_cb) OVERRIDE;	57 const DecoderInitCB& init_cb) OVERRIDE;

58 virtual void DecryptAndDecodeAudio(	58 virtual void DecryptAndDecodeAudio(

59 const scoped_refptr<DecoderBuffer>& encrypted,	59 const scoped_refptr<DecoderBuffer>& encrypted,

60 const AudioDecodeCB& audio_decode_cb) OVERRIDE;	60 const AudioDecodeCB& audio_decode_cb) OVERRIDE;

61 virtual void DecryptAndDecodeVideo(	61 virtual void DecryptAndDecodeVideo(

62 const scoped_refptr<DecoderBuffer>& encrypted,	62 const scoped_refptr<DecoderBuffer>& encrypted,

63 const VideoDecodeCB& video_decode_cb) OVERRIDE;	63 const VideoDecodeCB& video_decode_cb) OVERRIDE;

64 virtual void ResetDecoder(StreamType stream_type) OVERRIDE;	64 virtual void ResetDecoder(StreamType stream_type) OVERRIDE;

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
118	118

119 NewKeyCB new_audio_key_cb_;	119 NewKeyCB new_audio_key_cb_;

120 NewKeyCB new_video_key_cb_;	120 NewKeyCB new_video_key_cb_;

121	121

122 DISALLOW_COPY_AND_ASSIGN(AesDecryptor);	122 DISALLOW_COPY_AND_ASSIGN(AesDecryptor);

123 };	123 };

124	124

125 } // namespace media	125 } // namespace media

126	126

127 #endif // MEDIA_CRYPTO_AES_DECRYPTOR_H_	127 #endif // MEDIA_CRYPTO_AES_DECRYPTOR_H_

OLD	NEW