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

Unified Diff: media/base/android/media_decoder_job.cc

Issue 23321004: capture a top java exception on certain Samsung devices (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: return error code Created 7 years, 3 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
Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index 33b48302b0ec8f7dc447318efe424f9bf5a7a157..64beaf1aaa52af1529db49605cfbfc778b2167da 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -224,7 +224,11 @@ void MediaDecoderJob::DecodeInternal(
if (needs_flush) {
DVLOG(1) << "DecodeInternal needs flush.";
input_eos_encountered_ = false;
- media_codec_bridge_->Reset();
+ MediaCodecStatus reset_status = media_codec_bridge_->Reset();
+ if (MEDIA_CODEC_OK != reset_status) {
+ callback.Run(reset_status, start_presentation_timestamp, 0);
+ return;
+ }
}
MediaCodecStatus input_status = MEDIA_CODEC_INPUT_END_OF_STREAM;
« media/base/android/media_codec_bridge.h ('K') | « media/base/android/media_codec_bridge.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698