Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: media/filters/chunk_demuxer.h

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 3c0520ffa7232961bf9bba92d765a3de1105e5f9..3b5bed56f49f74622c3c64a7383e43da5dde428a 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -27,7 +27,7 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
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.
@@ -82,6 +82,7 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
// 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;
@@ -116,6 +117,8 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
// Specifies the type of the stream.
Type type_;
+ Liveness liveness_;
+
scoped_ptr<SourceBufferStream> stream_;
mutable base::Lock lock_;
@@ -165,7 +168,6 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
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.
//
@@ -379,7 +381,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
double user_specified_duration_;
base::Time timeline_offset_;
- Liveness liveness_;
+ DemuxerStream::Liveness liveness_;
typedef std::map<std::string, SourceState*> SourceStateMap;
SourceStateMap source_state_map_;

Powered by Google App Engine
This is Rietveld 408576698