Add FFmpeg audio decoder for the clear key CDM.

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"
@@ skipping 17 matching lines @@
 #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 FFmpegCdmAudioDecoder;
 class FFmpegCdmVideoDecoder;
 
 // Clear key implementation of the cdm::ContentDecryptionModule interface.
 class ClearKeyCdm : public cdm::ContentDecryptionModule {
  public:
   explicit ClearKeyCdm(cdm::Allocator* allocator, cdm::CdmHost*);
   virtual ~ClearKeyCdm();
 
   // ContentDecryptionModule implementation.
   virtual cdm::Status GenerateKeyRequest(
@@ skipping 105 matching lines @@
 
 #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<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
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CLEAR_KEY_CDM_H_