VAVDA: Redesign stage 1.

media/filters/gpu_video_decoder.cc

 // Copyright (c) 2012 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/filters/gpu_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/cpu.h"
 #include "base/message_loop.h"
@@ skipping 357 matching lines @@
 }
 
 bool GpuVideoDecoder::CanMoreDecodeWorkBeDone() {
   return bitstream_buffers_in_decoder_.size() < kMaxInFlightDecodes;
 }
 
 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);
     return;
   }
 
   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
     // |status| == kConfigChanged. For now we just trigger a decode error.
     state_ = kError;
     base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
     return;
   }
 
   DCHECK_EQ(status, DemuxerStream::kOk);
@@ skipping 311 matching lines @@
 
   state_ = kError;
 
   if (!pending_read_cb_.is_null()) {
     base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL);
     return;
   }
 }
 
 }  // namespace media