Minor cleanup of DecoderStreamTraits.

media/filters/decoder_stream_traits.cc

 // Copyright 2014 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/decoder_stream_traits.h"
 
 #include "base/logging.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/video_decoder.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
 std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() {
   return "Audio";
 }
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize(
     DecoderType* decoder,
     const DecoderConfigType& config,
     bool low_delay,
     const PipelineStatusCB& status_cb,
     const OutputCB& output_cb) {
   decoder->Initialize(config, status_cb, output_cb);
 }
 
-bool DecoderStreamTraits<DemuxerStream::AUDIO>::FinishInitialization(
-    const StreamInitCB& init_cb,
-    DecoderType* decoder,
-    DemuxerStream* stream) {
-  DCHECK(stream);
-  if (!decoder) {
-    init_cb.Run(false);
-    return false;
-  }
-  init_cb.Run(true);
-  return true;
-}
-
 void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
     const StatisticsCB& statistics_cb,
     int bytes_decoded) {
   PipelineStatistics statistics;
   statistics.audio_bytes_decoded = bytes_decoded;
   statistics_cb.Run(statistics);
 }
 
 DecoderStreamTraits<DemuxerStream::AUDIO>::DecoderConfigType
     DecoderStreamTraits<DemuxerStream::AUDIO>::GetDecoderConfig(
@@ skipping 12 matching lines @@
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize(
     DecoderType* decoder,
     const DecoderConfigType& config,
     bool low_delay,
     const PipelineStatusCB& status_cb,
     const OutputCB& output_cb) {
   decoder->Initialize(config, low_delay, status_cb, output_cb);
 }
 
-bool DecoderStreamTraits<DemuxerStream::VIDEO>::FinishInitialization(
-    const StreamInitCB& init_cb,
-    DecoderType* decoder,
-    DemuxerStream* stream) {
-  DCHECK(stream);
-  if (!decoder) {
-    init_cb.Run(false);
-    return false;
-  }
-  if (decoder->NeedsBitstreamConversion())
-    stream->EnableBitstreamConverter();
-  init_cb.Run(true);
-  return true;
+bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
+    DecoderType* decoder) {
+  DCHECK(decoder);

[scherkus (not reviewing), 2014/08/20 17:26:54]

nit: these types of checks where we immediately dereference a pointer aren't
needed

+  return decoder->NeedsBitstreamConversion();
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(
     const StatisticsCB& statistics_cb,
     int bytes_decoded) {
   PipelineStatistics statistics;
   statistics.video_bytes_decoded = bytes_decoded;
   statistics_cb.Run(statistics);
 }
 
 DecoderStreamTraits<DemuxerStream::VIDEO>::DecoderConfigType
     DecoderStreamTraits<DemuxerStream::VIDEO>::GetDecoderConfig(
         DemuxerStream& stream) {
   return stream.video_decoder_config();
 }
 
 scoped_refptr<DecoderStreamTraits<DemuxerStream::VIDEO>::OutputType>
     DecoderStreamTraits<DemuxerStream::VIDEO>::CreateEOSOutput() {
   return OutputType::CreateEOSFrame();
 }
 
 }  // namespace media