Add a libvpx video decoder to ClearKeyCdm and move the fake video decoder to its own class.

webkit/media/crypto/ppapi/clear_key_cdm.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor_client.h"
 #include "media/crypto/aes_decryptor.h"
 #include "webkit/media/crypto/ppapi/content_decryption_module.h"
 
 // Enable this to use the fake decoder for testing.
-// TODO(xhwang): Move fake decoders into separate classes.
+// TODO(tomfinegan): Move fake audio decoder into a separate class.
 #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
-#endif
-
 namespace media {
 class DecoderBuffer;
 }
 
 namespace webkit_media {
 
+class CdmVideoDecoder;
 class FFmpegCdmAudioDecoder;
-class FFmpegCdmVideoDecoder;
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
   ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost* cdm_host);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
   virtual cdm::Status GenerateKeyRequest(
       const char* type, int type_size,
@@ skipping 85 matching lines @@
 
   // Generates fake video frames with |duration_in_microseconds|.
   // Returns the number of samples generated in the |audio_frames|.
   int GenerateFakeAudioFramesFromDuration(int64 duration_in_microseconds,
                                           cdm::AudioFrames* audio_frames) const;
 
   // Generates fake video frames given |input_timestamp|.
   // Returns cdm::kSuccess if any audio frame is successfully generated.
   cdm::Status GenerateFakeAudioFrames(int64 timestamp_in_microseconds,
                                       cdm::AudioFrames* audio_frames);
-#endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
-
-#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-  // Generates a fake video frame with |video_size_| and |timestamp|.
-  void GenerateFakeVideoFrame(base::TimeDelta timestamp,
-                              cdm::VideoFrame* video_frame);
-#endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+#endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
   Client client_;
   media::AesDecryptor decryptor_;
 
   // Protects the |client_| from being accessed by the |decryptor_|
   // simultaneously.
   base::Lock client_lock_;
 
   cdm::Allocator* const allocator_;
   cdm::CdmHost* cdm_host_;
@@ skipping 10 matching lines @@
 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
   int channel_count_;
   int bits_per_channel_;
   int samples_per_second_;
   int64 output_timestamp_base_in_microseconds_;
   int total_samples_generated_;
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 #if defined(CLEAR_KEY_CDM_USE_FFMPEG_DECODER)
   scoped_ptr<FFmpegCdmAudioDecoder> audio_decoder_;
-  scoped_ptr<FFmpegCdmVideoDecoder> video_decoder_;
 #endif  // CLEAR_KEY_CDM_USE_FFMPEG_DECODER
 
-#if defined(CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER)
-  cdm::Size video_size_;
-#endif  // CLEAR_KEY_CDM_USE_FAKE_VIDEO_DECODER
+  scoped_ptr<CdmVideoDecoder> video_decoder_;
+
+  DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_