Add codec id into the media_format so that downstream filters can determine codec support.

Review URL: http://codereview.chromium.org/457023

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33472 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 6 insertions, 0 deletions

diff --git a/media/base/media_format.cc b/media/base/media_format.cc
index 543ada8..7c10cc8 100644
--- a/media/base/media_format.cc
+++ b/media/base/media_format.cc
@@ -59,6 +59,7 @@ const char MediaFormat::kSampleBits[]       = "SampleBits";
 const char MediaFormat::kChannels[]         = "Channels";
 const char MediaFormat::kWidth[]            = "Width";
 const char MediaFormat::kHeight[]           = "Height";
+const char MediaFormat::kFFmpegCodecID[]    = "FFmpegCodecID";
 
 MediaFormat::MediaFormat() {
 }
diff --git a/media/base/media_format.h b/media/base/media_format.h
index 298d68c..c131d82 100644
--- a/media/base/media_format.h
+++ b/media/base/media_format.h
@@ -52,6 +52,7 @@ class MediaFormat {
   static const char kChannels[];
   static const char kWidth[];
   static const char kHeight[];
+  static const char kFFmpegCodecID[];
 
   MediaFormat();
   ~MediaFormat();
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index c5372f9..dd08e40 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -61,10 +61,14 @@ FFmpegDemuxerStream::FFmpegDemuxerStream(FFmpegDemuxer* demuxer,
     case CODEC_TYPE_AUDIO:
       media_format_.SetAsString(MediaFormat::kMimeType,
                                 mime_type::kFFmpegAudio);
+      media_format_.SetAsInteger(MediaFormat::kFFmpegCodecID,
+                                 stream->codec->codec_id);
       break;
     case CODEC_TYPE_VIDEO:
       media_format_.SetAsString(MediaFormat::kMimeType,
                                 mime_type::kFFmpegVideo);
+      media_format_.SetAsInteger(MediaFormat::kFFmpegCodecID,
+                                 stream->codec->codec_id);
       break;
     default:
       NOTREACHED();