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

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 14914009: VAVDA: Redesign stage 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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
« content/content_common.gypi ('K') | « content/gpu/gpu_main.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/gpu_video_decoder.cc
diff --git a/media/filters/gpu_video_decoder.cc b/media/filters/gpu_video_decoder.cc
index 155f23cf01cabc0f97fa83b2b4ebcaa807964ef4..f8b5345374f9e717e0f8bbbdd4b389f5f1f3b60b 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -375,11 +375,12 @@ void GpuVideoDecoder::RequestBufferDecode(
DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
- DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;
+ //DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;
Ami GONE FROM CHROMIUM 2013/05/22 23:59:47 lolwat? Planning to revert this file?
Pawel Osciak 2013/05/24 01:46:39 lol, yeah sorry
demuxer_read_in_progress_ = false;
if (status == DemuxerStream::kAborted) {
+ DVLOG(1) << __PRETTY_FUNCTION__ << "ABORTED";
if (pending_read_cb_.is_null())
return;
base::ResetAndReturn(&pending_read_cb_).Run(kOk, NULL);
@@ -387,6 +388,8 @@ void GpuVideoDecoder::RequestBufferDecode(
}
if (status == DemuxerStream::kConfigChanged) {
+ DVLOG(1) << __PRETTY_FUNCTION__ << "CONFIG CHANGED";
+
if (pending_read_cb_.is_null())
return;
// TODO(acolwell): Add support for reinitializing the decoder when
« content/content_common.gypi ('K') | « content/gpu/gpu_main.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698