| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/filters/gpu_video_decoder.h" | 5 #include "media/filters/gpu_video_decoder.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 } | 188 } |
| 189 | 189 |
| 190 // Throw away any already-decoded, not-yet-delivered frames. | 190 // Throw away any already-decoded, not-yet-delivered frames. |
| 191 ready_video_frames_.clear(); | 191 ready_video_frames_.clear(); |
| 192 | 192 |
| 193 if (!vda_.get()) { | 193 if (!vda_.get()) { |
| 194 gvd_loop_proxy_->PostTask(FROM_HERE, closure); | 194 gvd_loop_proxy_->PostTask(FROM_HERE, closure); |
| 195 return; | 195 return; |
| 196 } | 196 } |
| 197 | 197 |
| 198 // VideoRendererBase::Flush() can't complete while it has a pending read to | |
| 199 // us, so we fulfill such a read here. | |
| 200 if (!pending_read_cb_.is_null()) | 198 if (!pending_read_cb_.is_null()) |
| 201 EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame()); | 199 EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame()); |
| 202 | 200 |
| 203 DCHECK(pending_reset_cb_.is_null()); | 201 DCHECK(pending_reset_cb_.is_null()); |
| 204 pending_reset_cb_ = BindToCurrentLoop(closure); | 202 pending_reset_cb_ = BindToCurrentLoop(closure); |
| 205 | 203 |
| 206 vda_loop_proxy_->PostTask(FROM_HERE, base::Bind( | 204 vda_loop_proxy_->PostTask(FROM_HERE, base::Bind( |
| 207 &VideoDecodeAccelerator::Reset, weak_vda_)); | 205 &VideoDecodeAccelerator::Reset, weak_vda_)); |
| 208 } | 206 } |
| 209 | 207 |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 701 | 699 |
| 702 error_occured_ = true; | 700 error_occured_ = true; |
| 703 | 701 |
| 704 if (!pending_read_cb_.is_null()) { | 702 if (!pending_read_cb_.is_null()) { |
| 705 base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL); | 703 base::ResetAndReturn(&pending_read_cb_).Run(kDecodeError, NULL); |
| 706 return; | 704 return; |
| 707 } | 705 } |
| 708 } | 706 } |
| 709 | 707 |
| 710 } // namespace media | 708 } // namespace media |
| OLD | NEW |