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

Unified Diff: media/filters/media_source_state.h

Issue 1812543003: Allow muting/unmuting audio through media track API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink-sb-tracks6
Patch Set: Avoid ChunkDemuxer/PipelineImpl deadlock Created 4 years, 8 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/ffmpeg_demuxer.cc ('k') | media/filters/media_source_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/media_source_state.h
diff --git a/media/filters/media_source_state.h b/media/filters/media_source_state.h
index 89974a6b506e2971566d840439232bafc411b1e7..616cd447d883ee118767ca4fefd12fa2942354a2 100644
--- a/media/filters/media_source_state.h
+++ b/media/filters/media_source_state.h
@@ -20,12 +20,13 @@ using base::TimeDelta;
class ChunkDemuxerStream;
class FrameProcessor;
+class MediaTrack;
// Contains state belonging to a source id.
class MEDIA_EXPORT MediaSourceState {
public:
// Callback signature used to create ChunkDemuxerStreams.
- typedef base::Callback<ChunkDemuxerStream*(DemuxerStream::Type)>
+ typedef base::Callback<ChunkDemuxerStream*(const MediaTrack&)>
CreateDemuxerStreamCB;
typedef base::Callback<void(ChunkDemuxerStream*, const TextTrackConfig&)>
@@ -190,8 +191,6 @@ class MEDIA_EXPORT MediaSourceState {
// The object used to parse appended data.
scoped_ptr<StreamParser> stream_parser_;
- scoped_ptr<MediaTracks> media_tracks_;
-
ChunkDemuxerStream* audio_; // Not owned by |this|.
ChunkDemuxerStream* video_; // Not owned by |this|.
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/media_source_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698