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

Unified 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 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 f20c6c40905c250fd513c6a1279c1e76e79ac59d..1572f24946753cdbce169284fce84051a3e86e43 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -24,6 +24,7 @@
#include "media/base/video_frame.h"
#include "media/muxers/webm_muxer.h"
#include "third_party/WebKit/public/platform/WebMediaRecorderHandlerClient.h"
+#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/public/platform/WebString.h"
using base::TimeDelta;
@@ -134,11 +135,15 @@ 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[0].isEnabled();
+ const bool use_video_tracks = !video_tracks.isEmpty() &&
+ video_tracks[0].isEnabled() &&
+ video_tracks[0].source().getReadyState() ==
+ blink::WebMediaStreamSource::ReadyStateLive;
+ const bool use_audio_tracks = !audio_tracks.isEmpty() &&
+ MediaStreamAudioTrack::From(audio_tracks[0]) &&
+ audio_tracks[0].isEnabled() &&
+ audio_tracks[0].source().getReadyState() ==
+ blink::WebMediaStreamSource::ReadyStateLive;
webm_muxer_.reset(new media::WebmMuxer(
use_vp9_ ? media::kCodecVP9 : media::kCodecVP8, use_video_tracks,
« 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