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

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

Issue 669623004: Switch to Lollipop APIs for MediaCodec (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 1 month 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 | « media/base/android/media_codec_bridge_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 61df5c07e1987f48a13ca3f0a70a1a31824946b8..2be8ef1821298eca43aa1a72a41d9fe2c45ae0e0 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -430,10 +430,7 @@ void MediaDecoderJob::DecodeInternal(
&presentation_timestamp,
&output_eos_encountered_,
NULL);
- if (status == MEDIA_CODEC_OUTPUT_BUFFERS_CHANGED &&
- !media_codec_bridge_->GetOutputBuffers()) {
- status = MEDIA_CODEC_ERROR;
- } else if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
+ if (status == MEDIA_CODEC_OUTPUT_FORMAT_CHANGED) {
// TODO(qinmin): instead of waiting for the next output buffer to be
// dequeued, post a task on the UI thread to signal the format change.
has_format_change = true;
« no previous file with comments | « media/base/android/media_codec_bridge_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698