Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/mojo/services/mojo_demuxer_stream_adapter.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/mojo/services/mojo_demuxer_stream_adapter.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "media/base/decoder_buffer.h"
 #include "media/mojo/services/media_type_converters.h"
@@ skipping 30 matching lines @@
 
 VideoDecoderConfig MojoDemuxerStreamAdapter::video_decoder_config() {
   NOTREACHED();
   return VideoDecoderConfig();
 }
 
 media::DemuxerStream::Type MojoDemuxerStreamAdapter::type() {
   return media::DemuxerStream::AUDIO;
 }
 
+media::DemuxerStream::Liveness MojoDemuxerStreamAdapter::liveness() {
+  return media::DemuxerStream::LIVENESS_UNKNOWN;

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

nit: this is essentially a duplicate of the default implementation. Remove until
some different version is needed.

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

Done.

+}
+
 void MojoDemuxerStreamAdapter::EnableBitstreamConverter() {
   NOTREACHED();
 }
 
 bool MojoDemuxerStreamAdapter::SupportsConfigChanges() {
   return true;
 }
 
 VideoRotation MojoDemuxerStreamAdapter::video_rotation() {
   NOTIMPLEMENTED();
   return VIDEO_ROTATION_0;
 }
 
+// TODO(xhwang): Pass liveness here.
 void MojoDemuxerStreamAdapter::OnStreamReady(
     mojo::ScopedDataPipeConsumerHandle pipe) {
   DVLOG(1) << __FUNCTION__;
   // TODO(tim): We don't support pipe streaming yet.
   DCHECK(!pipe.is_valid());
   DCHECK(!config_queue_.empty());
   stream_ready_cb_.Run();
 }
 
 void MojoDemuxerStreamAdapter::OnAudioDecoderConfigChanged(
@@ skipping 25 matching lines @@
     // If the |config_queue_| is empty we need to wait for
     // OnAudioDecoderConfigChanged before invoking |read_cb|.
     if (config_queue_.empty())
       return;
   }
   read_cb_.Run(media_status, media_buffer);
   read_cb_.Reset();
 }
 
 }  // namespace media