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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 2718483003: Use base::Optional for selected video track. (Closed)
Patch Set: 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
« media/blink/webmediaplayer_impl.cc ('K') | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/test/pipeline_integration_test.cc » ('J')
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 84a8051e234975523382deaf8e16a65bac3f8769..f9219bcf11e718941933e321b45eff38e4e70b26 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -240,8 +240,9 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
void OnEnabledAudioTracksChanged(const std::vector<MediaTrack::Id>& track_ids,
base::TimeDelta currTime) override;
- // |track_ids| is either empty or contains a single video track id.
- void OnSelectedVideoTrackChanged(const std::vector<MediaTrack::Id>& track_ids,
+ // |track_id| either contains the selected video track id or is null,
+ // indicating that all video tracks are deselected/disabled.
+ void OnSelectedVideoTrackChanged(base::Optional<MediaTrack::Id> track_id,
base::TimeDelta currTime) override;
// The lowest demuxed timestamp. If negative, DemuxerStreams must use this to
« media/blink/webmediaplayer_impl.cc ('K') | « media/filters/chunk_demuxer.cc ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | media/test/pipeline_integration_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698