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

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

Issue 1824933005: MediaStreamTrack: don't wait to record MediaStreamTrack's whose state is not 'live' (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 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"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/strings/string_tokenizer.h" 13 #include "base/strings/string_tokenizer.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "content/renderer/media/audio_track_recorder.h" 15 #include "content/renderer/media/audio_track_recorder.h"
16 #include "content/renderer/media/media_stream_audio_track.h" 16 #include "content/renderer/media/media_stream_audio_track.h"
17 #include "content/renderer/media/media_stream_track.h" 17 #include "content/renderer/media/media_stream_track.h"
18 #include "content/renderer/media/video_track_recorder.h" 18 #include "content/renderer/media/video_track_recorder.h"
19 #include "content/renderer/media/webrtc_uma_histograms.h" 19 #include "content/renderer/media/webrtc_uma_histograms.h"
20 #include "media/audio/audio_parameters.h" 20 #include "media/audio/audio_parameters.h"
21 #include "media/base/audio_bus.h" 21 #include "media/base/audio_bus.h"
22 #include "media/base/bind_to_current_loop.h" 22 #include "media/base/bind_to_current_loop.h"
23 #include "media/base/mime_util.h" 23 #include "media/base/mime_util.h"
24 #include "media/base/video_frame.h" 24 #include "media/base/video_frame.h"
25 #include "media/muxers/webm_muxer.h" 25 #include "media/muxers/webm_muxer.h"
26 #include "third_party/WebKit/public/platform/WebMediaRecorderHandlerClient.h" 26 #include "third_party/WebKit/public/platform/WebMediaRecorderHandlerClient.h"
27 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
27 #include "third_party/WebKit/public/platform/WebString.h" 28 #include "third_party/WebKit/public/platform/WebString.h"
28 29
29 using base::TimeDelta; 30 using base::TimeDelta;
30 using base::TimeTicks; 31 using base::TimeTicks;
31 32
32 namespace content { 33 namespace content {
33 34
34 MediaRecorderHandler::MediaRecorderHandler() 35 MediaRecorderHandler::MediaRecorderHandler()
35 : video_bits_per_second_(0), 36 : video_bits_per_second_(0),
36 audio_bits_per_second_(0), 37 audio_bits_per_second_(0),
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 128
128 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks; 129 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks;
129 media_stream_.videoTracks(video_tracks); 130 media_stream_.videoTracks(video_tracks);
130 media_stream_.audioTracks(audio_tracks); 131 media_stream_.audioTracks(audio_tracks);
131 132
132 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) { 133 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) {
133 LOG(WARNING) << __FUNCTION__ << ": no media tracks."; 134 LOG(WARNING) << __FUNCTION__ << ": no media tracks.";
134 return false; 135 return false;
135 } 136 }
136 137
137 const bool use_video_tracks = 138 const bool use_video_tracks = !video_tracks.isEmpty() &&
138 !video_tracks.isEmpty() && video_tracks[0].isEnabled(); 139 video_tracks[0].isEnabled() &&
139 const bool use_audio_tracks = 140 video_tracks[0].source().getReadyState() ==
140 !audio_tracks.isEmpty() && MediaStreamAudioTrack::From(audio_tracks[0]) 141 blink::WebMediaStreamSource::ReadyStateLive;
141 && audio_tracks[0].isEnabled(); 142 const bool use_audio_tracks = !audio_tracks.isEmpty() &&
143 MediaStreamAudioTrack::From(audio_tracks[0]) &&
144 audio_tracks[0].isEnabled() &&
145 audio_tracks[0].source().getReadyState() ==
146 blink::WebMediaStreamSource::ReadyStateLive;
142 147
143 webm_muxer_.reset(new media::WebmMuxer( 148 webm_muxer_.reset(new media::WebmMuxer(
144 use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks, 149 use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks,
145 use_audio_tracks, base::Bind(&MediaRecorderHandler::WriteData, 150 use_audio_tracks, base::Bind(&MediaRecorderHandler::WriteData,
146 weak_factory_.GetWeakPtr()))); 151 weak_factory_.GetWeakPtr())));
147 152
148 if (use_video_tracks) { 153 if (use_video_tracks) {
149 // 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
150 // several video tracks, see http://crbug.com/528523. 155 // several video tracks, see http://crbug.com/528523.
151 LOG_IF(WARNING, video_tracks.size() > 1u) 156 LOG_IF(WARNING, video_tracks.size() > 1u)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 recorder->OnData(audio_bus, timestamp); 267 recorder->OnData(audio_bus, timestamp);
263 } 268 }
264 269
265 void MediaRecorderHandler::SetAudioFormatForTesting( 270 void MediaRecorderHandler::SetAudioFormatForTesting(
266 const media::AudioParameters& params) { 271 const media::AudioParameters& params) {
267 for (auto* recorder : audio_recorders_) 272 for (auto* recorder : audio_recorders_)
268 recorder->OnSetFormat(params); 273 recorder->OnSetFormat(params);
269 } 274 }
270 275
271 } // namespace content 276 } // 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