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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 2491043003: MediaResource refactoring to support multiple streams (Closed)
Patch Set: Added a TODO about DemuxerStream enabled/set_enabled methods Created 3 years, 10 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
« no previous file with comments | « media/filters/decrypting_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 d12ec8911d99337ed5bc1f8c9c2a3f8df22652b5..0543376099afc15a715d5ab5a13390c530287a9c 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -116,7 +116,8 @@ class FFmpegDemuxerStream : public DemuxerStream {
VideoRotation video_rotation() override;
bool enabled() const override;
void set_enabled(bool enabled, base::TimeDelta timestamp) override;
- void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
+
+ void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb);
void SetLiveness(Liveness liveness);
@@ -218,7 +219,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
void CancelPendingSeek(base::TimeDelta seek_time) override;
void Seek(base::TimeDelta time, const PipelineStatusCB& cb) override;
base::Time GetTimelineOffset() const override;
- DemuxerStream* GetStream(DemuxerStream::Type type) override;
+ std::vector<DemuxerStream*> GetAllStreams() override;
+ void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb) override;
base::TimeDelta GetStartTime() const override;
int64_t GetMemoryUsage() const override;
@@ -276,9 +278,10 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// Called by |url_protocol_| whenever |data_source_| returns a read error.
void OnDataSourceError();
- // Returns the stream from |streams_| that matches |type| as an
- // FFmpegDemuxerStream.
- FFmpegDemuxerStream* GetFFmpegStream(DemuxerStream::Type type) const;
+ // Returns the first stream from |streams_| that matches |type| as an
+ // FFmpegDemuxerStream and is enabled.
+ FFmpegDemuxerStream* GetFirstEnabledFFmpegStream(
+ DemuxerStream::Type type) const;
// Called after the streams have been collected from the media, to allow
// the text renderer to bind each text stream to the cue rendering engine.
« no previous file with comments | « media/filters/decrypting_demuxer_stream.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698