EME: Handle NO_KEY and resume playback after key is added.

content/common/gpu/media/android_video_decode_accelerator.cc

 // Copyright (c) 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 "content/common/gpu/media/android_video_decode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "content/common/gpu/gpu_channel.h"
@@ skipping 134 matching lines @@
 void AndroidVideoDecodeAccelerator::QueueInput() {
   if (bitstreams_notified_in_advance_.size() > kMaxBitstreamsNotifiedInAdvance)
     return;
   if (pending_bitstream_buffers_.empty())
     return;
 
   int input_buf_index = 0;
   media::MediaCodecStatus status = media_codec_->DequeueInputBuffer(
       NoWaitTimeOut(), &input_buf_index);
   if (status != media::MEDIA_CODEC_OK) {
-    DCHECK(status == media::MEDIA_CODEC_ENQUEUE_INPUT_AGAIN_LATER ||
+    DCHECK(status == media::MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER ||
            status == media::MEDIA_CODEC_ERROR);
     return;
   }
 
   media::BitstreamBuffer& bitstream_buffer =
       pending_bitstream_buffers_.front();
 
   if (bitstream_buffer.id() == -1) {
     media_codec_->QueueEOS(input_buf_index);
     pending_bitstream_buffers_.pop();
@@ skipping 244 matching lines @@
   // TODO(dwkang): find out a way to remove the following hard-coded value.
   media_codec_->Start(
       codec_, gfx::Size(1280, 720), surface.j_surface().obj(), NULL);
   media_codec_->GetOutputBuffers();
   return true;
 }
 
 void AndroidVideoDecodeAccelerator::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  while(!pending_bitstream_buffers_.empty()) {
+  while (!pending_bitstream_buffers_.empty()) {
     media::BitstreamBuffer& bitstream_buffer =
         pending_bitstream_buffers_.front();
     pending_bitstream_buffers_.pop();
 
     if (bitstream_buffer.id() != -1) {
       base::MessageLoop::current()->PostTask(FROM_HERE, base::Bind(
           &AndroidVideoDecodeAccelerator::NotifyEndOfBitstreamBuffer,
           base::AsWeakPtr(this), bitstream_buffer.id()));
     }
   }
@@ skipping 52 matching lines @@
 void AndroidVideoDecodeAccelerator::NotifyResetDone() {
   client_->NotifyResetDone();
 }
 
 void AndroidVideoDecodeAccelerator::NotifyError(
     media::VideoDecodeAccelerator::Error error) {
   client_->NotifyError(error);
 }
 
 }  // namespace content