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

Unified Diff: media/filters/gpu_video_decoder.cc

Issue 57403003: Remove EMPTY from VideoFrame::Format. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@vframe_rgb
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/video_frame_stream.cc » ('j') | 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 44ccf35ec1e4c81af67d2c7ffaac89196df5ed05..bd449340a7581487eebeae4782e22f89853a6417 100644
--- a/media/filters/gpu_video_decoder.cc
+++ b/media/filters/gpu_video_decoder.cc
@@ -91,7 +91,7 @@ void GpuVideoDecoder::Reset(const base::Closure& closure) {
}
if (!pending_decode_cb_.is_null())
- EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
+ EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEOSFrame());
DCHECK(pending_reset_cb_.is_null());
pending_reset_cb_ = BindToCurrentLoop(closure);
@@ -104,7 +104,7 @@ void GpuVideoDecoder::Stop(const base::Closure& closure) {
if (vda_)
DestroyVDA();
if (!pending_decode_cb_.is_null())
- EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
+ EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEOSFrame());
if (!pending_reset_cb_.is_null())
base::ResetAndReturn(&pending_reset_cb_).Run();
BindToCurrentLoop(closure).Run();
@@ -574,7 +574,7 @@ void GpuVideoDecoder::NotifyFlushDone() {
DCHECK(gvd_loop_proxy_->BelongsToCurrentThread());
DCHECK_EQ(state_, kDrainingDecoder);
state_ = kDecoderDrained;
- EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
+ EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEOSFrame());
}
void GpuVideoDecoder::NotifyResetDone() {
@@ -590,7 +590,7 @@ void GpuVideoDecoder::NotifyResetDone() {
base::ResetAndReturn(&pending_reset_cb_).Run();
if (!pending_decode_cb_.is_null())
- EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEmptyFrame());
+ EnqueueFrameAndTriggerFrameDelivery(VideoFrame::CreateEOSFrame());
}
void GpuVideoDecoder::NotifyError(media::VideoDecodeAccelerator::Error error) {
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/filters/video_frame_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698