41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
|
From 3c216600f55351549573cf94be541fc6055db128 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Debarshi Ray <rishi@gnu.org>
|
||
|
|
Date: Thu, 1 Nov 2012 22:02:39 +0100
|
||
|
|
Subject: [PATCH 1/2] vp8dec: Short circuit gst_vp8_dec_handle_frame if
|
||
|
|
keyframe is missing
|
||
|
|
|
||
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=687376
|
||
|
|
---
|
||
|
|
ext/vpx/gstvp8dec.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/ext/vpx/gstvp8dec.c b/ext/vpx/gstvp8dec.c
|
||
|
|
index 9ec1771..7dcd75b 100644
|
||
|
|
--- a/ext/vpx/gstvp8dec.c
|
||
|
|
+++ b/ext/vpx/gstvp8dec.c
|
||
|
|
@@ -415,7 +415,7 @@ open_codec (GstVP8Dec * dec, GstVideoCodecFrame * frame)
|
||
|
|
if (status != VPX_CODEC_OK || !stream_info.is_kf) {
|
||
|
|
GST_WARNING_OBJECT (dec, "No keyframe, skipping");
|
||
|
|
gst_video_decoder_finish_frame (GST_VIDEO_DECODER (dec), frame);
|
||
|
|
- return GST_FLOW_OK;
|
||
|
|
+ return GST_FLOW_CUSTOM_SUCCESS_1;
|
||
|
|
}
|
||
|
|
|
||
|
|
g_assert (dec->output_state == NULL);
|
||
|
|
@@ -483,8 +483,11 @@ gst_vp8_dec_handle_frame (GstVideoDecoder * decoder, GstVideoCodecFrame * frame)
|
||
|
|
|
||
|
|
dec = GST_VP8_DEC (decoder);
|
||
|
|
|
||
|
|
- if (!dec->decoder_inited)
|
||
|
|
+ if (!dec->decoder_inited) {
|
||
|
|
ret = open_codec (dec, frame);
|
||
|
|
+ if (ret == GST_FLOW_CUSTOM_SUCCESS_1)
|
||
|
|
+ return GST_FLOW_OK;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
deadline = gst_video_decoder_get_max_decode_time (decoder, frame);
|
||
|
|
if (deadline < 0) {
|
||
|
|
--
|
||
|
|
1.7.12.1
|
||
|
|
|