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

Unified Diff: media/filters/ffmpeg_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/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 0543376099afc15a715d5ab5a13390c530287a9c..84a8051e234975523382deaf8e16a65bac3f8769 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -59,7 +59,7 @@ class FFmpegGlue;
typedef std::unique_ptr<AVPacket, ScopedPtrAVFreePacket> ScopedAVPacket;
-class FFmpegDemuxerStream : public DemuxerStream {
+class MEDIA_EXPORT FFmpegDemuxerStream : public DemuxerStream {
public:
// Attempts to create FFmpegDemuxerStream form the given AVStream. Will return
// null if the AVStream cannot be translated into a valid decoder config.
@@ -114,8 +114,9 @@ class FFmpegDemuxerStream : public DemuxerStream {
AudioDecoderConfig audio_decoder_config() override;
VideoDecoderConfig video_decoder_config() 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);
@@ -363,7 +364,7 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
const MediaTracksUpdatedCB media_tracks_updated_cb_;
- std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
+ std::map<MediaTrack::Id, FFmpegDemuxerStream*> track_id_to_demux_stream_map_;
// NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtr<FFmpegDemuxer> weak_this_;
« 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