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

media/filters/ffmpeg_demuxer.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 "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/filter_host.h"
 #include "media/filters/ffmpeg_common.h"
 #include "media/filters/ffmpeg_demuxer.h"
@@ skipping 42 matching lines @@
     : demuxer_(demuxer),
       av_stream_(stream),
       discontinuous_(false) {
   DCHECK(demuxer_);
 
   // Determine our media format.
   switch (stream->codec->codec_type) {
     case CODEC_TYPE_AUDIO:
       media_format_.SetAsString(MediaFormat::kMimeType,
                                 mime_type::kFFmpegAudio);
-      media_format_.SetAsInteger(MediaFormat::kChannels,
-                                 stream->codec->channels);

[awong, 2009/04/28 23:25:56]

do we just not need these values anymore?

[scherkus (not reviewing), 2009/04/28 23:31:10]

the mime types "audio/x-ffmpeg" and "video/x-ffmpeg" are clues to downstream
decoders that they can query the demuxer to expose the underlying AVStream
object.  Once they have the AVStream object, they can access all of these fields
(and more!) directly

-      media_format_.SetAsInteger(MediaFormat::kSampleRate,
-                                 stream->codec->sample_rate);
-      media_format_.SetAsInteger(MediaFormat::kSampleBits,
-                                 stream->codec->bits_per_raw_sample);
       break;
     case CODEC_TYPE_VIDEO:
       media_format_.SetAsString(MediaFormat::kMimeType,
                                 mime_type::kFFmpegVideo);
-      media_format_.SetAsInteger(MediaFormat::kHeight,
-                                 stream->codec->height);
-      media_format_.SetAsInteger(MediaFormat::kWidth,
-                                 stream->codec->width);
       break;
     default:
       NOTREACHED();
       break;
   }
-  int codec_id = static_cast<int>(stream->codec->codec_id);
-  media_format_.SetAsInteger(kFFmpegCodecID, codec_id);
 
   // Calculate the time base and duration in microseconds.
   int64 time_base_us = static_cast<int64>(av_q2d(stream->time_base) *
       base::Time::kMicrosecondsPerSecond);
   int64 duration_us = static_cast<int64>(time_base_us * stream->duration);
   time_base_ = base::TimeDelta::FromMicroseconds(time_base_us);
   duration_ = base::TimeDelta::FromMicroseconds(duration_us);
 }
 
 FFmpegDemuxerStream::~FFmpegDemuxerStream() {
@@ skipping 260 matching lines @@
   StreamVector::iterator iter;
   for (iter = streams_.begin(); iter != streams_.end(); ++iter) {
     if ((*iter)->HasPendingReads()) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace media