Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/base/demuxer_stream.h

 // 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.
 
 #ifndef MEDIA_BASE_DEMUXER_STREAM_H_
 #define MEDIA_BASE_DEMUXER_STREAM_H_
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "media/base/media_export.h"
 #include "media/base/video_rotation.h"
 
 namespace media {
 
 class AudioDecoderConfig;
 class DecoderBuffer;
 class VideoDecoderConfig;
 
 class MEDIA_EXPORT DemuxerStream {
  public:
   enum Type {
     UNKNOWN,
     AUDIO,
     VIDEO,
     TEXT,
     NUM_TYPES,  // Always keep this entry as the last one!
   };
 
+  enum Liveness {
+    LIVENESS_UNKNOWN,
+    LIVENESS_RECORDED,
+    LIVENESS_LIVE,
+  };
+
   // Status returned in the Read() callback.
   //  kOk : Indicates the second parameter is Non-NULL and contains media data
   //        or the end of the stream.
   //  kAborted : Indicates an aborted Read(). This can happen if the
   //             DemuxerStream gets flushed and doesn't have any more data to
   //             return. The second parameter MUST be NULL when this status is
   //             returned.
   //  kConfigChange : Indicates that the AudioDecoderConfig or
   //                  VideoDecoderConfig for the stream has changed.
   //                  The DemuxerStream expects an audio_decoder_config() or
@@ skipping 12 matching lines @@
 
   // Request a buffer to returned via the provided callback.
   //
   // The first parameter indicates the status of the read.
   // The second parameter is non-NULL and contains media data
   // or the end of the stream if the first parameter is kOk. NULL otherwise.
   typedef base::Callback<void(Status,
                               const scoped_refptr<DecoderBuffer>&)>ReadCB;
   virtual void Read(const ReadCB& read_cb) = 0;
 
-  // Returns the audio decoder configuration. It is an error to call this method
-  // if type() != AUDIO.
+  // Returns the audio/video decoder configuration. It is an error to call the
+  // audio method on a video stream and vice versa. After |kConfigChanged| is
+  // returned in a Read(), the caller should call this method again to retrieve
+  // the new config.
   virtual AudioDecoderConfig audio_decoder_config() = 0;
-
-  // Returns the video decoder configuration. It is an error to call this method
-  // if type() != VIDEO.
   virtual VideoDecoderConfig video_decoder_config() = 0;
 
   // Returns the type of stream.
   virtual Type type() = 0;

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

nit: adding const seems reasonable to me here (and in overrides).

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

Done.

 
+  // Returns liveness of the streams provided, i.e. whether recorded or live.
+  virtual Liveness liveness();

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

nit: ditto const

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

Done.

+
   virtual void EnableBitstreamConverter();
 
   // Whether or not this DemuxerStream allows midstream configuration changes.
   //
   // A DemuxerStream that returns 'true' to this may return the 'kConfigChange'
   // status from a Read() call. In this case the client is expected to be
   // capable of taking appropriate action to handle config changes. Otherwise
   // audio_decoder_config() and video_decoder_config()'s return values are
   // guaranteed to remain constant, and the client may make optimizations based
   // on this.
   virtual bool SupportsConfigChanges() = 0;
 
   virtual VideoRotation video_rotation() = 0;
 
  protected:
   // Only allow concrete implementations to get deleted.
   virtual ~DemuxerStream();
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DEMUXER_STREAM_H_