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

Side by Side Diff: content/renderer/media/media_recorder_handler.cc

Issue 1973143002: Allow MediaRecorder to record Muted streams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 7 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/renderer/media/media_recorder_handler.h" 5 #include "content/renderer/media/media_recorder_handler.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 128
129 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks; 129 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks;
130 media_stream_.videoTracks(video_tracks); 130 media_stream_.videoTracks(video_tracks);
131 media_stream_.audioTracks(audio_tracks); 131 media_stream_.audioTracks(audio_tracks);
132 132
133 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) { 133 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) {
134 LOG(WARNING) << __FUNCTION__ << ": no media tracks."; 134 LOG(WARNING) << __FUNCTION__ << ": no media tracks.";
135 return false; 135 return false;
136 } 136 }
137 137
138 const bool use_video_tracks = !video_tracks.isEmpty() && 138 const bool use_video_tracks =
139 video_tracks[0].isEnabled() && 139 !video_tracks.isEmpty() && video_tracks[0].isEnabled() &&
140 video_tracks[0].source().getReadyState() == 140 video_tracks[0].source().getReadyState() !=
141 blink::WebMediaStreamSource::ReadyStateLive; 141 blink::WebMediaStreamSource::ReadyStateEnded;
142 const bool use_audio_tracks = !audio_tracks.isEmpty() && 142 const bool use_audio_tracks =
143 MediaStreamAudioTrack::From(audio_tracks[0]) && 143 !audio_tracks.isEmpty() && MediaStreamAudioTrack::From(audio_tracks[0]) &&
144 audio_tracks[0].isEnabled() && 144 audio_tracks[0].isEnabled() &&
145 audio_tracks[0].source().getReadyState() == 145 audio_tracks[0].source().getReadyState() !=
146 blink::WebMediaStreamSource::ReadyStateLive; 146 blink::WebMediaStreamSource::ReadyStateEnded;
147 147
148 webm_muxer_.reset(new media::WebmMuxer( 148 webm_muxer_.reset(new media::WebmMuxer(
149 use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks, 149 use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks,
150 use_audio_tracks, base::Bind(&MediaRecorderHandler::WriteData, 150 use_audio_tracks, base::Bind(&MediaRecorderHandler::WriteData,
151 weak_factory_.GetWeakPtr()))); 151 weak_factory_.GetWeakPtr())));
152 152
153 if (use_video_tracks) { 153 if (use_video_tracks) {
154 // TODO(mcasas): The muxer API supports only one video track. Extend it to 154 // TODO(mcasas): The muxer API supports only one video track. Extend it to
155 // several video tracks, see http://crbug.com/528523. 155 // several video tracks, see http://crbug.com/528523.
156 LOG_IF(WARNING, video_tracks.size() > 1u) 156 LOG_IF(WARNING, video_tracks.size() > 1u)
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 recorder->OnData(audio_bus, timestamp); 274 recorder->OnData(audio_bus, timestamp);
275 } 275 }
276 276
277 void MediaRecorderHandler::SetAudioFormatForTesting( 277 void MediaRecorderHandler::SetAudioFormatForTesting(
278 const media::AudioParameters& params) { 278 const media::AudioParameters& params) {
279 for (auto* recorder : audio_recorders_) 279 for (auto* recorder : audio_recorders_)
280 recorder->OnSetFormat(params); 280 recorder->OnSetFormat(params);
281 } 281 }
282 282
283 } // namespace content 283 } // namespace content
OLDNEW
« 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