media: Add DecoderConfigType in 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 <limits>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 17 matching lines @@
     DecoderType* decoder) {
   return decoder->NeedsBitstreamConversion();
 }
 
 // static
 scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType>
     DecoderStreamTraits<DemuxerStream::AUDIO>::CreateEOSOutput() {
   return OutputType::CreateEOSBuffer();
 }
 
+// static
+DecoderStreamTraits<DemuxerStream::AUDIO>::DecoderConfigType
+DecoderStreamTraits<DemuxerStream::AUDIO>::GetDecoderConfig(
+    DemuxerStream* stream) {
+  return stream->audio_decoder_config();
+}
+
 DecoderStreamTraits<DemuxerStream::AUDIO>::DecoderStreamTraits(
     const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log) {}
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
     const StatisticsCB& statistics_cb,
     int bytes_decoded) {
   PipelineStatistics statistics;
   statistics.audio_bytes_decoded = bytes_decoded;
   statistics_cb.Run(statistics);
 }
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::InitializeDecoder(
     DecoderType* decoder,
-    DemuxerStream* stream,
+    const DecoderConfigType& config,
+    bool /* low_delay */,
     CdmContext* cdm_context,
     const InitCB& init_cb,
     const OutputCB& output_cb) {
-  DCHECK(stream->audio_decoder_config().IsValidConfig());
-  decoder->Initialize(stream->audio_decoder_config(), cdm_context, init_cb,
-                      output_cb);
+  DCHECK(config.IsValidConfig());
+  decoder->Initialize(config, cdm_context, init_cb, output_cb);
 }
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::OnStreamReset(
     DemuxerStream* stream) {
   DCHECK(stream);
   // Stream is likely being seeked to a new timestamp, so make new validator to
   // build new timestamp expectations.
   audio_ts_validator_.reset(
       new AudioTimestampValidator(stream->audio_decoder_config(), media_log_));
 }
@@ skipping 20 matching lines @@
     DecoderType* decoder) {
   return decoder->NeedsBitstreamConversion();
 }
 
 // static
 scoped_refptr<DecoderStreamTraits<DemuxerStream::VIDEO>::OutputType>
 DecoderStreamTraits<DemuxerStream::VIDEO>::CreateEOSOutput() {
   return OutputType::CreateEOSFrame();
 }
 
+// static
+DecoderStreamTraits<DemuxerStream::VIDEO>::DecoderConfigType
+DecoderStreamTraits<DemuxerStream::VIDEO>::GetDecoderConfig(
+    DemuxerStream* stream) {
+  return stream->video_decoder_config();
+}
+
 DecoderStreamTraits<DemuxerStream::VIDEO>::DecoderStreamTraits(
     const scoped_refptr<MediaLog>& media_log)
     // Randomly selected number of samples to keep.
     : keyframe_distance_average_(16) {}
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(
     const StatisticsCB& statistics_cb,
     int bytes_decoded) {
   PipelineStatistics statistics;
   statistics.video_bytes_decoded = bytes_decoded;
 
   if (keyframe_distance_average_.count()) {
     statistics.video_keyframe_distance_average =
         keyframe_distance_average_.Average();
   } else {
     // Before we have enough keyframes to calculate the average distance, we
     // will assume the average keyframe distance is infinitely large.
     statistics.video_keyframe_distance_average = base::TimeDelta::Max();
   }
 
   statistics_cb.Run(statistics);
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder(
     DecoderType* decoder,
-    DemuxerStream* stream,
+    const DecoderConfigType& config,
+    bool low_delay,
     CdmContext* cdm_context,
     const InitCB& init_cb,
     const OutputCB& output_cb) {
-  DCHECK(stream->video_decoder_config().IsValidConfig());
-  decoder->Initialize(stream->video_decoder_config(),
-                      stream->liveness() == DemuxerStream::LIVENESS_LIVE,
-                      cdm_context, init_cb, output_cb);
+  DCHECK(config.IsValidConfig());
+  decoder->Initialize(config, low_delay, cdm_context, init_cb, output_cb);
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::OnStreamReset(
     DemuxerStream* stream) {
   DCHECK(stream);
   last_keyframe_timestamp_ = base::TimeDelta();
 }
 
 void DecoderStreamTraits<DemuxerStream::VIDEO>::OnDecode(
     const scoped_refptr<DecoderBuffer>& buffer) {
@@ skipping 15 matching lines @@
   }
 
   base::TimeDelta frame_distance =
       current_frame_timestamp - last_keyframe_timestamp_;
   UMA_HISTOGRAM_MEDIUM_TIMES("Media.Video.KeyFrameDistance", frame_distance);
   last_keyframe_timestamp_ = current_frame_timestamp;
   keyframe_distance_average_.AddSample(frame_distance);
 }
 
 }  // namespace media