Clean up FFmpeg media formats and switch to using av_get_bits_per_sample_format().

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2009 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.
 
 #include "media/base/data_buffer.h"
 #include "media/filters/ffmpeg_audio_decoder.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
 
 namespace media {
 
 // Size of the decoded audio buffer.
 const size_t FFmpegAudioDecoder::kOutputBufferSize =
     AVCODEC_MAX_AUDIO_FRAME_SIZE;
 
 FFmpegAudioDecoder::FFmpegAudioDecoder()
     : DecoderBase<AudioDecoder, Buffer>(NULL),
       codec_context_(NULL) {
 }
 
 FFmpegAudioDecoder::~FFmpegAudioDecoder() {
 }
 
 // static
 bool FFmpegAudioDecoder::IsMediaFormatSupported(const MediaFormat& format) {
-  int channels, sample_bits, sample_rate;
   std::string mime_type;
-  if (format.GetAsInteger(MediaFormat::kChannels, &channels) &&
-      format.GetAsInteger(MediaFormat::kSampleBits, &sample_bits) &&
-      format.GetAsInteger(MediaFormat::kSampleRate, &sample_rate) &&
-      format.GetAsString(MediaFormat::kMimeType, &mime_type) &&
-      mime_type::kFFmpegAudio == mime_type) {
-    return true;
-  }
-  return false;
+  return format.GetAsString(MediaFormat::kMimeType, &mime_type) &&
+      mime_type::kFFmpegAudio == mime_type;
 }
 
 bool FFmpegAudioDecoder::OnInitialize(DemuxerStream* demuxer_stream) {
   scoped_refptr<FFmpegDemuxerStream> ffmpeg_demuxer_stream;
 
   // Try to obtain a reference to FFmpegDemuxer.
   if (!demuxer_stream->
           QueryInterface<FFmpegDemuxerStream>(&ffmpeg_demuxer_stream))
     return false;
 
   // Setting the media format.
   // TODO(hclam): Reuse the information provided by the demuxer for now, we may
   // need to wait until the first buffer is decoded to know the correct
   // information.
   codec_context_ = ffmpeg_demuxer_stream->av_stream()->codec;
   media_format_.SetAsInteger(MediaFormat::kChannels, codec_context_->channels);
   media_format_.SetAsInteger(MediaFormat::kSampleBits,
-      codec_context_->bits_per_coded_sample);
+      av_get_bits_per_sample_format(codec_context_->sample_fmt));
   media_format_.SetAsInteger(MediaFormat::kSampleRate,
       codec_context_->sample_rate);
   media_format_.SetAsString(MediaFormat::kMimeType,
       mime_type::kUncompressedAudio);
 
   // Grab the codec context from FFmpeg demuxer.
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
   if (!codec || avcodec_open(codec_context_, codec) < 0) {
     host_->Error(PIPELINE_ERROR_DECODE);
     return false;
@@ skipping 29 matching lines @@
     DataBuffer* result_buffer = new DataBuffer();
     memcpy(result_buffer->GetWritableData(output_buffer_size),
            output_buffer, output_buffer_size);
     result_buffer->SetTimestamp(input->GetTimestamp());
     result_buffer->SetDuration(input->GetDuration());
     EnqueueResult(result_buffer);
   }
 }
 
 }  // namespace