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

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

Issue 2633623002: MediaRecorder: handle libwebm::Segment::AddFrame() errors and wire up to Blink (Closed)
Patch Set: I can haz moar testing? Created 3 years, 11 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 | content/renderer/media/media_recorder_handler_unittest.cc » ('j') | 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 cea6710b159b6332dcdd7feea700c524ba27d134..9fde39595793b388853cc6d4f8143ebd2a35a7ea 100644
--- a/content/renderer/media/media_recorder_handler.cc
+++ b/content/renderer/media/media_recorder_handler.cc
@@ -266,8 +266,11 @@ void MediaRecorderHandler::OnEncodedVideo(
DCHECK(main_render_thread_checker_.CalledOnValidThread());
if (!webm_muxer_)
return;
- webm_muxer_->OnEncodedVideo(params, std::move(encoded_data), timestamp,
- is_key_frame);
+ if (!webm_muxer_->OnEncodedVideo(params, std::move(encoded_data), timestamp,
+ is_key_frame)) {
+ DLOG(ERROR) << "Error muxing video data";
+ client_->onError("Error muxing video data");
+ }
}
void MediaRecorderHandler::OnEncodedAudio(
@@ -275,8 +278,13 @@ void MediaRecorderHandler::OnEncodedAudio(
std::unique_ptr<std::string> encoded_data,
base::TimeTicks timestamp) {
DCHECK(main_render_thread_checker_.CalledOnValidThread());
- if (webm_muxer_)
- webm_muxer_->OnEncodedAudio(params, std::move(encoded_data), timestamp);
+ if (!webm_muxer_)
+ return;
+ if (!webm_muxer_->OnEncodedAudio(params, std::move(encoded_data),
+ timestamp)) {
+ DLOG(ERROR) << "Error muxing audio data";
+ client_->onError("Error muxing audio data");
+ }
}
void MediaRecorderHandler::WriteData(base::StringPiece data) {
« no previous file with comments | « no previous file | content/renderer/media/media_recorder_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698