Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/filters/decoder_stream_traits.cc

Index: media/filters/decoder_stream_traits.cc
diff --git a/media/filters/decoder_stream_traits.cc b/media/filters/decoder_stream_traits.cc
index 1c654c3b08f690362dcb6d7ad0a1439ce758d6aa..de8f86009b7f5c298ae5c655cd0e2f4bf8f1a2aa 100644
--- a/media/filters/decoder_stream_traits.cc
+++ b/media/filters/decoder_stream_traits.cc
@@ -18,13 +18,13 @@ std::string DecoderStreamTraits<DemuxerStream::AUDIO>::ToString() {
   return "audio";
 }
 
-void DecoderStreamTraits<DemuxerStream::AUDIO>::Initialize(
+void DecoderStreamTraits<DemuxerStream::AUDIO>::InitializeDecoder(
     DecoderType* decoder,
-    const DecoderConfigType& config,
-    bool low_delay,
+    DemuxerStream* stream,
     const PipelineStatusCB& status_cb,
     const OutputCB& output_cb) {
-  decoder->Initialize(config, status_cb, output_cb);
+  DCHECK(stream->audio_decoder_config().IsValidConfig());
+  decoder->Initialize(stream->audio_decoder_config(), status_cb, output_cb);

[wolenetz, 2014/11/11 23:48:07]

Another double-check: Audio decoders don't care about "low delay" or liveness,
right?

[xhwang, 2014/11/14 06:38:04]

I think it's either not needed, or not implemented yet.

[wolenetz, 2014/11/14 19:21:58]

Acknowledged.

 }
 
 void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
@@ -35,12 +35,6 @@ void DecoderStreamTraits<DemuxerStream::AUDIO>::ReportStatistics(
   statistics_cb.Run(statistics);
 }
 
-DecoderStreamTraits<DemuxerStream::AUDIO>::DecoderConfigType
-    DecoderStreamTraits<DemuxerStream::AUDIO>::GetDecoderConfig(
-        DemuxerStream& stream) {
-  return stream.audio_decoder_config();
-}
-
 scoped_refptr<DecoderStreamTraits<DemuxerStream::AUDIO>::OutputType>
     DecoderStreamTraits<DemuxerStream::AUDIO>::CreateEOSOutput() {
   return OutputType::CreateEOSBuffer();
@@ -50,13 +44,15 @@ std::string DecoderStreamTraits<DemuxerStream::VIDEO>::ToString() {
   return "video";
 }
 
-void DecoderStreamTraits<DemuxerStream::VIDEO>::Initialize(
+void DecoderStreamTraits<DemuxerStream::VIDEO>::InitializeDecoder(
     DecoderType* decoder,
-    const DecoderConfigType& config,
-    bool low_delay,
+    DemuxerStream* stream,
     const PipelineStatusCB& status_cb,
     const OutputCB& output_cb) {
-  decoder->Initialize(config, low_delay, status_cb, output_cb);
+  DCHECK(stream->video_decoder_config().IsValidConfig());
+  decoder->Initialize(stream->video_decoder_config(),
+                      stream->liveness() == DemuxerStream::LIVENESS_LIVE,
+                      status_cb, output_cb);
 }
 
 bool DecoderStreamTraits<DemuxerStream::VIDEO>::NeedsBitstreamConversion(
@@ -72,12 +68,6 @@ void DecoderStreamTraits<DemuxerStream::VIDEO>::ReportStatistics(
   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();