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

Unified Diff: media/filters/chunk_demuxer.h

Issue 2698713003: Remove enabled/set_enabled from DemuxerStream interface (Closed)
Patch Set: cast_shell build fix 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/base/mock_filters.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 844ad8e5121f46dd5f4e1d65637f2450c9d03df9..f18cae4dd574191d2a861b01fbd7de99bfb99ca8 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -114,8 +114,9 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
VideoDecoderConfig video_decoder_config() override;
bool SupportsConfigChanges() override;
VideoRotation video_rotation() override;
- bool enabled() const override;
- void set_enabled(bool enabled, base::TimeDelta timestamp) override;
+
+ bool enabled() const;
+ void set_enabled(bool enabled, base::TimeDelta timestamp);
void SetStreamStatusChangeCB(const StreamStatusChangeCB& cb);
@@ -453,7 +454,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
int detected_video_track_count_;
int detected_text_track_count_;
- std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
+ std::map<MediaTrack::Id, ChunkDemuxerStream*> track_id_to_demux_stream_map_;
DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
};
« no previous file with comments | « media/base/mock_filters.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698