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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 692323002: Move Liveness from DemuxerStreamProvider to DemuxerStream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mojo Created 6 years, 1 month 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
« no previous file with comments | « media/filters/fake_demuxer_stream.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 82ac5dea198df901a9b60203e6efd238957795a9..76d0fbb0fd5c7014e083b086c52bfa6a0d183713 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -86,7 +86,8 @@ class FFmpegDemuxerStream : public DemuxerStream {
}
// DemuxerStream implementation.
- Type type() override;
+ Type type() const override;
+ Liveness liveness() const override;
void Read(const ReadCB& read_cb) override;
void EnableBitstreamConverter() override;
bool SupportsConfigChanges() override;
@@ -94,6 +95,8 @@ class FFmpegDemuxerStream : public DemuxerStream {
VideoDecoderConfig video_decoder_config() override;
VideoRotation video_rotation() override;
+ void SetLiveness(Liveness liveness);
+
// Returns the range of buffered data in this stream.
Ranges<base::TimeDelta> GetBufferedRanges() const;
@@ -136,6 +139,7 @@ class FFmpegDemuxerStream : public DemuxerStream {
AudioDecoderConfig audio_config_;
VideoDecoderConfig video_config_;
Type type_;
+ Liveness liveness_;
base::TimeDelta duration_;
bool end_of_stream_;
base::TimeDelta last_packet_timestamp_;
@@ -173,7 +177,6 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
base::Time GetTimelineOffset() const override;
DemuxerStream* GetStream(DemuxerStream::Type type) override;
base::TimeDelta GetStartTime() const override;
- Liveness GetLiveness() const override;
// Calls |need_key_cb_| with the initialization data encountered in the file.
void FireNeedKey(const std::string& init_data_type,
@@ -225,6 +228,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// the text renderer to bind each text stream to the cue rendering engine.
void AddTextStreams();
+ void SetLiveness(DemuxerStream::Liveness liveness);
+
DemuxerHost* host_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
@@ -283,9 +288,6 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// time if the file doesn't have an association to Time.
base::Time timeline_offset_;
- // Liveness of the stream.
- Liveness liveness_;
-
// Whether text streams have been enabled for this demuxer.
bool text_enabled_;
« no previous file with comments | « media/filters/fake_demuxer_stream.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698