Switch to Lollipop APIs for MediaCodec

media/base/android/media_decoder_job.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/media_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 412 matching lines @@
   // MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER is received.
   do {
     status = media_codec_bridge_->DequeueOutputBuffer(
         timeout,
         &buffer_index,
         &offset,
         &size,
         &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;
     }
   } while (status != MEDIA_CODEC_OK && status != MEDIA_CODEC_ERROR &&
            status != MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER);
 
   if (status != MEDIA_CODEC_OK) {
     callback.Run(status, kNoTimestamp(), kNoTimestamp());
     return;
@@ skipping 212 matching lines @@
 
 void MediaDecoderJob::ReleaseMediaCodecBridge() {
   if (!media_codec_bridge_)
     return;
 
   media_codec_bridge_.reset();
   input_buf_index_ = -1;
 }
 
 }  // namespace media