| OLD | NEW |
| 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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 160 | 160 |
| 161 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks; | 161 blink::WebVector<blink::WebMediaStreamTrack> video_tracks, audio_tracks; |
| 162 media_stream_.videoTracks(video_tracks); | 162 media_stream_.videoTracks(video_tracks); |
| 163 media_stream_.audioTracks(audio_tracks); | 163 media_stream_.audioTracks(audio_tracks); |
| 164 | 164 |
| 165 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) { | 165 if (video_tracks.isEmpty() && audio_tracks.isEmpty()) { |
| 166 LOG(WARNING) << __FUNCTION__ << ": no media tracks."; | 166 LOG(WARNING) << __FUNCTION__ << ": no media tracks."; |
| 167 return false; | 167 return false; |
| 168 } | 168 } |
| 169 | 169 |
| 170 const bool use_video_tracks = !video_tracks.isEmpty() && | 170 const bool use_video_tracks = |
| 171 video_tracks[0].isEnabled() && | 171 !video_tracks.isEmpty() && video_tracks[0].isEnabled() && |
| 172 video_tracks[0].source().getReadyState() == | 172 video_tracks[0].source().getReadyState() != |
| 173 blink::WebMediaStreamSource::ReadyStateLive; | 173 blink::WebMediaStreamSource::ReadyStateEnded; |
| 174 const bool use_audio_tracks = !audio_tracks.isEmpty() && | 174 const bool use_audio_tracks = |
| 175 MediaStreamAudioTrack::From(audio_tracks[0]) && | 175 !audio_tracks.isEmpty() && MediaStreamAudioTrack::From(audio_tracks[0]) && |
| 176 audio_tracks[0].isEnabled() && | 176 audio_tracks[0].isEnabled() && |
| 177 audio_tracks[0].source().getReadyState() == | 177 audio_tracks[0].source().getReadyState() != |
| 178 blink::WebMediaStreamSource::ReadyStateLive; | 178 blink::WebMediaStreamSource::ReadyStateEnded; |
| 179 | 179 |
| 180 webm_muxer_.reset(new media::WebmMuxer( | 180 webm_muxer_.reset(new media::WebmMuxer( |
| 181 CodecIdToMediaVideoCodec(codec_id_), use_video_tracks, use_audio_tracks, | 181 CodecIdToMediaVideoCodec(codec_id_), use_video_tracks, use_audio_tracks, |
| 182 base::Bind(&MediaRecorderHandler::WriteData, | 182 base::Bind(&MediaRecorderHandler::WriteData, |
| 183 weak_factory_.GetWeakPtr()))); | 183 weak_factory_.GetWeakPtr()))); |
| 184 | 184 |
| 185 if (use_video_tracks) { | 185 if (use_video_tracks) { |
| 186 // TODO(mcasas): The muxer API supports only one video track. Extend it to | 186 // TODO(mcasas): The muxer API supports only one video track. Extend it to |
| 187 // several video tracks, see http://crbug.com/528523. | 187 // several video tracks, see http://crbug.com/528523. |
| 188 LOG_IF(WARNING, video_tracks.size() > 1u) | 188 LOG_IF(WARNING, video_tracks.size() > 1u) |
| (...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 recorder->OnData(audio_bus, timestamp); | 306 recorder->OnData(audio_bus, timestamp); |
| 307 } | 307 } |
| 308 | 308 |
| 309 void MediaRecorderHandler::SetAudioFormatForTesting( | 309 void MediaRecorderHandler::SetAudioFormatForTesting( |
| 310 const media::AudioParameters& params) { | 310 const media::AudioParameters& params) { |
| 311 for (auto* recorder : audio_recorders_) | 311 for (auto* recorder : audio_recorders_) |
| 312 recorder->OnSetFormat(params); | 312 recorder->OnSetFormat(params); |
| 313 } | 313 } |
| 314 | 314 |
| 315 } // namespace content | 315 } // namespace content |
| OLD | NEW |