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

Unified Diff: content/renderer/media/media_recorder_handler.cc

Issue 1812373002: MediaRecorder: ignored disabled audio/video tracks on MR start (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_recorder_handler.cc
diff --git a/content/renderer/media/media_recorder_handler.cc b/content/renderer/media/media_recorder_handler.cc
index b734af8e6ffe1e1509aec27a623461d1f3b961d1..f20c6c40905c250fd513c6a1279c1e76e79ac59d 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -134,16 +134,18 @@ bool MediaRecorderHandler::start(int timeslice) {
return false;
}
+ const bool use_video_tracks =
+ !video_tracks.isEmpty() && video_tracks[0].isEnabled();
const bool use_audio_tracks =
- !audio_tracks.isEmpty() && MediaStreamAudioTrack::From(audio_tracks[0]);
+ !audio_tracks.isEmpty() && MediaStreamAudioTrack::From(audio_tracks[0])
+ && audio_tracks[0].isEnabled();
webm_muxer_.reset(new media::WebmMuxer(
- use_vp9_ ? media::kCodecVP9 : media::kCodecVP8,
- video_tracks.size() > 0, use_audio_tracks,
- base::Bind(&MediaRecorderHandler::WriteData,
- weak_factory_.GetWeakPtr())));
+ use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks,
+ use_audio_tracks, base::Bind(&MediaRecorderHandler::WriteData,
+ weak_factory_.GetWeakPtr())));
- if (!video_tracks.isEmpty()) {
+ if (use_video_tracks) {
// TODO(mcasas): The muxer API supports only one video track. Extend it to
// several video tracks, see http://crbug.com/528523.
LOG_IF(WARNING, video_tracks.size() > 1u)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698