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

Unified Diff: media/filters/chunk_demuxer.cc

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/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index f5038579c166428751129e3bc69848fb500c94f9..177a819452a5eb7ea01e1adc4c99517335291572 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -695,9 +695,9 @@ void ChunkDemuxer::OnEnabledAudioTracksChanged(
const std::vector<MediaTrack::Id>& track_ids,
base::TimeDelta currTime) {
base::AutoLock auto_lock(lock_);
- std::set<DemuxerStream*> enabled_streams;
+ std::set<ChunkDemuxerStream*> enabled_streams;
for (const auto& id : track_ids) {
- DemuxerStream* stream = track_id_to_demux_stream_map_[id];
+ ChunkDemuxerStream* stream = track_id_to_demux_stream_map_[id];
DCHECK(stream);
DCHECK_EQ(DemuxerStream::AUDIO, stream->type());
enabled_streams.insert(stream);
@@ -723,7 +723,7 @@ void ChunkDemuxer::OnSelectedVideoTrackChanged(
DCHECK_LE(track_ids.size(), 1u);
base::AutoLock auto_lock(lock_);
- DemuxerStream* selected_stream = nullptr;
+ ChunkDemuxerStream* selected_stream = nullptr;
if (!track_ids.empty()) {
selected_stream = track_id_to_demux_stream_map_[track_ids[0]];
DCHECK(selected_stream);
« no previous file with comments | « media/filters/chunk_demuxer.h ('k') | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698