media/blink/websourcebuffer_impl.cc - Issue 1812543003: Allow muting/unmuting audio through media track API

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/blink/websourcebuffer_impl.cc

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 unified diff | Download patch

« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "media/blink/websourcebuffer_impl.h"	5 #include "media/blink/websourcebuffer_impl.h"

6	6

7 #include <stdint.h>	7 #include <stdint.h>

8	8

9 #include <cmath>	9 #include <cmath>

10 #include <limits>	10 #include <limits>

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
182 trackInfoVector.push_back(	182 trackInfoVector.push_back(

183 std::make_tuple(mediaTrackTypeToBlink(track->type()),	183 std::make_tuple(mediaTrackTypeToBlink(track->type()),

184 blink::WebString::fromUTF8(track->id()),	184 blink::WebString::fromUTF8(track->id()),

185 blink::WebString::fromUTF8(track->kind()),	185 blink::WebString::fromUTF8(track->kind()),

186 blink::WebString::fromUTF8(track->label()),	186 blink::WebString::fromUTF8(track->label()),

187 blink::WebString::fromUTF8(track->language())));	187 blink::WebString::fromUTF8(track->language())));

188 }	188 }

189	189

190 std::vector<blink::WebMediaPlayer::TrackId> blinkTrackIds =	190 std::vector<blink::WebMediaPlayer::TrackId> blinkTrackIds =

191 client_->initializationSegmentReceived(trackInfoVector);	191 client_->initializationSegmentReceived(trackInfoVector);

	192

	193 demuxer_->OnTrackIdsAssigned(*tracks.get(), blinkTrackIds);

192 }	194 }

193	195

194 } // namespace media	196 } // namespace media

OLD	NEW