Plumb support for audio sample formats.

media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h

Index: media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
diff --git a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
index 35a01df4bc016b65d2fb89125a17c6f5460b2706..6e170ad4a82addab7d19fb59e0446c32a966ce4b 100644
--- a/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/media/cdm/ppapi/ffmpeg_cdm_audio_decoder.h
@@ -49,7 +49,7 @@ class FFmpegCdmAudioDecoder {
   cdm::Status DecodeBuffer(const uint8_t* compressed_buffer,
                            int32_t compressed_buffer_size,
                            int64_t timestamp,
-                           cdm::AudioFrames_1* decoded_frames);
+                           cdm::AudioFrames* decoded_frames);
 
  private:
   void ResetTimestampState();
@@ -68,7 +68,6 @@ class FFmpegCdmAudioDecoder {
   scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
 
   // Audio format.
-  int bits_per_channel_;
   int samples_per_second_;
   int channels_;
 
@@ -80,10 +79,6 @@ class FFmpegCdmAudioDecoder {
   int bytes_per_frame_;
   base::TimeDelta last_input_timestamp_;
 
-  // We may need to convert the audio data coming out of FFmpeg from planar
-  // float to integer.
-  scoped_ptr<AudioBus> converter_bus_;
-
   // Number of output sample bytes to drop before generating output buffers.
   // This is required for handling negative timestamps when decoding Vorbis
   // audio, for example.