Reorganize bitstream converter classes.

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 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/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/limits.h"
 #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 {
 
 //
 // FFmpegDemuxerStream
 //
 FFmpegDemuxerStream::FFmpegDemuxerStream(
     FFmpegDemuxer* demuxer,
     AVStream* stream)
     : demuxer_(demuxer),
@@ skipping 167 matching lines @@
 
   // Execute the callback.
   read_cb.Run(buffer);
 }
 
 void FFmpegDemuxerStream::EnableBitstreamConverter() {
   // Called by hardware decoder to require different bitstream converter.
   // Currently we assume that converter is determined by codec_id;
   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.";
   }
 }
 
 const AudioDecoderConfig& FFmpegDemuxerStream::audio_decoder_config() {
   CHECK_EQ(type_, AUDIO);
   return audio_config_;
 }
 
@@ skipping 502 matching lines @@
   } else if (audio) {
     buffered = audio->GetBufferedRanges();
   } else if (video) {
     buffered = video->GetBufferedRanges();
   }
   for (size_t i = 0; i < buffered.size(); ++i)
     host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
 }
 
 }  // namespace media