Reorganize bitstream converter classes.

media/filters/ffmpeg_demuxer.cc

Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 00de84134f47c6e2b22b940d7dc55148b99b1fc0..d34ffef048e9f68f63ee14dcdeab0a52e5fafe8f 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -21,9 +21,8 @@
 #include "media/base/media_switches.h"
 #include "media/base/video_decoder_config.h"
 #include "media/ffmpeg/ffmpeg_common.h"
-#include "media/filters/bitstream_converter.h"
 #include "media/filters/ffmpeg_glue.h"
-#include "media/filters/ffmpeg_h264_bitstream_converter.h"
+#include "media/filters/ffmpeg_h264_to_annex_b_bitstream_converter.h"
 
 namespace media {
 
@@ -212,14 +211,8 @@ void FFmpegDemuxerStream::EnableBitstreamConverter() {
   DCHECK(stream_);
 
   if (stream_->codec->codec_id == CODEC_ID_H264) {

[Ami GONE FROM CHROMIUM, 2012/07/11 22:33:17]

this would be both simpler and more informative at failure as a:
DCHECK_EQ(stream_->codec->codec_id, CODEC_ID_H264);
and then drop the if/else/NOTREACHED.

[xhwang, 2012/07/12 00:21:45]

Done. So I assume only H.264 would trigger the GpuVideoDecoder and this code
path?

[Ami GONE FROM CHROMIUM, 2012/07/12 00:27:54]

Yep

-    // Use Chromium bitstream converter in case of H.264
     bitstream_converter_.reset(
-        new FFmpegH264BitstreamConverter(stream_->codec));
-    CHECK(bitstream_converter_->Initialize());
-  } else if (stream_->codec->codec_id == CODEC_ID_MPEG4) {
-    bitstream_converter_.reset(
-        new FFmpegBitstreamConverter("mpeg4video_es", stream_->codec));
-    CHECK(bitstream_converter_->Initialize());
+        new FFmpegH264ToAnnexBBitstreamConverter(stream_->codec));
   } else {
     NOTREACHED() << "Unsupported bitstream format.";
   }