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

Unified Diff: content/common/gpu/media/android_video_decode_accelerator.cc

Issue 23545029: EME: Handle NO_KEY and resume playback after key is added. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only 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: content/common/gpu/media/android_video_decode_accelerator.cc
diff --git a/content/common/gpu/media/android_video_decode_accelerator.cc b/content/common/gpu/media/android_video_decode_accelerator.cc
index e21c6237e3568cba8f454a009918ca4a429b24a0..b3c62984129dd69ccdc67501c333c4b242f0a563 100644
--- a/content/common/gpu/media/android_video_decode_accelerator.cc
+++ b/content/common/gpu/media/android_video_decode_accelerator.cc
@@ -152,7 +152,7 @@ void AndroidVideoDecodeAccelerator::QueueInput() {
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;
}
@@ -417,7 +417,7 @@ bool AndroidVideoDecodeAccelerator::ConfigureMediaCodec() {
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();
« no previous file with comments | « content/browser/android/browser_media_player_manager.cc ('k') | content/common/media/media_player_messages_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698