Move Liveness from DemuxerStreamProvider to DemuxerStream.

media/filters/chunk_demuxer.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_FILTERS_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <deque>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/synchronization/lock.h"
 #include "media/base/byte_queue.h"
 #include "media/base/demuxer.h"
 #include "media/base/ranges.h"
 #include "media/base/stream_parser.h"
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 class FFmpegURLProtocol;
 class SourceState;
 
 class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {

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

nit: In this file, explicitly #include "media/base/demuxer_stream.h"

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

Done.

  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  explicit ChunkDemuxerStream(Type type, bool splice_frames_enabled);
+  ChunkDemuxerStream(Type type, Liveness liveness, bool splice_frames_enabled);
   ~ChunkDemuxerStream() override;
 
   // ChunkDemuxerStream control methods.
   void StartReturningData();
   void AbortReads();
   void CompletePendingReadIfPossible();
   void Shutdown();
 
   // SourceBufferStream manipulation methods.
   void Seek(base::TimeDelta time);
@@ skipping 34 matching lines @@
   bool UpdateAudioConfig(const AudioDecoderConfig& config, const LogCB& log_cb);
   bool UpdateVideoConfig(const VideoDecoderConfig& config, const LogCB& log_cb);
   void UpdateTextConfig(const TextTrackConfig& config, const LogCB& log_cb);
 
   void MarkEndOfStream();
   void UnmarkEndOfStream();
 
   // DemuxerStream methods.
   void Read(const ReadCB& read_cb) override;
   Type type() override;
+  Liveness liveness() override;
   AudioDecoderConfig audio_decoder_config() override;
   VideoDecoderConfig video_decoder_config() override;
   bool SupportsConfigChanges() override;
   VideoRotation video_rotation() override;
 
   // Returns the text track configuration.  It is an error to call this method
   // if type() != TEXT.
   TextTrackConfig text_track_config();
 
   // Sets the memory limit, in bytes, on the SourceBufferStream.
@@ skipping 14 matching lines @@
   };
 
   // Assigns |state_| to |state|
   void ChangeState_Locked(State state);
 
   void CompletePendingReadIfPossible_Locked();
 
   // Specifies the type of the stream.
   Type type_;
 
+  Liveness liveness_;
+
   scoped_ptr<SourceBufferStream> stream_;
 
   mutable base::Lock lock_;
   State state_;
   ReadCB read_cb_;
   bool splice_frames_enabled_;
   bool partial_append_window_trimming_enabled_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
@@ skipping 29 matching lines @@
 
   // Demuxer implementation.
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& cb,
                   bool enable_text_tracks) override;
   void Stop() override;
   void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
   base::Time GetTimelineOffset() const override;
   DemuxerStream* GetStream(DemuxerStream::Type type) override;
   base::TimeDelta GetStartTime() const override;
-  Liveness GetLiveness() const override;
 
   // Methods used by an external object to control this demuxer.
   //
   // Indicates that a new Seek() call is on its way. Any pending Reads on the
   // DemuxerStream objects should be aborted immediately inside this call and
   // future Read calls should return kAborted until the Seek() call occurs.
   // This method MUST ALWAYS be called before Seek() is called to signal that
   // the next Seek() call represents the seek point we actually want to return
   // data for.
   // |seek_time| - The presentation timestamp for the seek that triggered this
@@ skipping 193 matching lines @@
   base::TimeDelta duration_;
 
   // The duration passed to the last SetDuration(). If
   // SetDuration() is never called or an AppendData() call or
   // a EndOfStream() call changes |duration_|, then this
   // variable is set to < 0 to indicate that the |duration_| represents
   // the actual duration instead of a user specified value.
   double user_specified_duration_;
 
   base::Time timeline_offset_;
-  Liveness liveness_;
+  DemuxerStream::Liveness liveness_;
 
   typedef std::map<std::string, SourceState*> SourceStateMap;
   SourceStateMap source_state_map_;
 
   // Used to ensure that (1) config data matches the type and codec provided in
   // AddId(), (2) only 1 audio and 1 video sources are added, and (3) ids may be
   // removed with RemoveID() but can not be re-added (yet).
   std::string source_id_audio_;
   std::string source_id_video_;
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_