From patchwork Fri Feb 28 15:30:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 17963 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 65A2A44AF26 for ; Fri, 28 Feb 2020 17:34:50 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E81A68B1A2; Fri, 28 Feb 2020 17:34:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAD1768AF9A for ; Fri, 28 Feb 2020 17:34:42 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Feb 2020 07:34:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.70,496,1574150400"; d="scan'208";a="238789397" Received: from icl-dev.sh.intel.com ([10.239.158.73]) by orsmga003.jf.intel.com with ESMTP; 28 Feb 2020 07:34:39 -0800 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2020 23:30:31 +0800 Message-Id: <1582903831-20063-1-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH] lavfi/vf_vpp_qsv: fix the infinite loop while framerate lower than input X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There are frame droppings in frc while converting into a lower framerate, and MSDK returns ERROR_MORE_DATA which should be ignored. Reported-by: Gupta, Pallavi Signed-off-by: Linjie Fu --- Could be reproduced by: ffmpeg -hwaccel qsv -c:v hevc_qsv -i input_25fps.h265 -vf vpp_qsv=framerate=20 -c:v hevc_qsv -b:v 4M 4M20FPS.mp4 libavfilter/vf_vpp_qsv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavfilter/vf_vpp_qsv.c b/libavfilter/vf_vpp_qsv.c index 8585874..0218c2a 100644 --- a/libavfilter/vf_vpp_qsv.c +++ b/libavfilter/vf_vpp_qsv.c @@ -476,6 +476,9 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *picref) if (vpp->qsv) { ret = ff_qsvvpp_filter_frame(vpp->qsv, inlink, picref); + /* ignore the EAGAIN caused by frame dropping in frc */ + if (ret == AVERROR(EAGAIN)) + ret = av_cmp_q(vpp->framerate, inlink->frame_rate) < 0 ? 0 : ret; av_frame_free(&picref); } else { if (picref->pts != AV_NOPTS_VALUE)