Chromium Code Reviews| Index: webkit/media/crypto/ppapi/clear_key_cdm.h |
| diff --git a/webkit/media/crypto/ppapi/clear_key_cdm.h b/webkit/media/crypto/ppapi/clear_key_cdm.h |
| index 09bc01b7ce353ce7b73c8b9293fda2bb4ef0e6ea..79ee8ed90a161c1a357194a26b4e6dcf028af4fe 100644 |
| --- a/webkit/media/crypto/ppapi/clear_key_cdm.h |
| +++ b/webkit/media/crypto/ppapi/clear_key_cdm.h |
| @@ -17,7 +17,13 @@ |
| #include "webkit/media/crypto/ppapi/content_decryption_module.h" |
| // Enable this to use the fake decoder for testing. |
| -// #define CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER |
| +#if 0 |
| +#define CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
| +#endif |
| + |
| +#if 0 |
| +#define CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER |
| +#endif |
| #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) |
| #undef CLEAR_KEY_CDM_USE_FFMPEG_DECODER |
|
ddorwin
2012/10/24 17:59:27
Do we really want separate FFMPEG uses for video a
xhwang
2012/10/24 19:45:57
Do you want me to fix this here? Or in Tom's ffmpe
ddorwin
2012/10/24 20:08:37
In patch 2, Tom said he will add a TODO, then we'l
|
| @@ -125,6 +131,10 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule { |
| const cdm::InputBuffer& encrypted_buffer, |
| scoped_refptr<media::DecoderBuffer>* decrypted_buffer); |
| +#if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) |
| + void GenerateFakeAudioFrames(cdm::AudioFrames* audio_frames); |
| +#endif // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER |
| + |
| #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) |
| void GenerateFakeVideoFrame(base::TimeDelta timestamp, |
| cdm::VideoFrame* video_frame); |
| @@ -139,9 +149,17 @@ class ClearKeyCdm : public cdm::ContentDecryptionModule { |
| cdm::Allocator* const allocator_; |
| +#if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) |
| + int channel_count_; |
| + int bits_per_channel_; |
| + int samples_per_second_; |
| + base::TimeDelta last_timestamp_; |
| + base::TimeDelta last_duration_; |
| +#endif // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER |
| + |
| #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER) |
| scoped_ptr<FFmpegCdmVideoDecoder> video_decoder_; |
| -#endif |
| +#endif // CLEAR_KEY_CDM_USE_FFMPEG_DECODER |
| #if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER) |
| cdm::Size video_size_; |