From patchwork Tue Jan 23 04:33:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 7394 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp3806857jak; Mon, 22 Jan 2018 20:33:48 -0800 (PST) X-Google-Smtp-Source: AH8x226rquWB1oSWvRQ1i9MujBRiDu2H2ydKdauKmpSClVXou2v79mXeE0fzCdIunNALzwQTq8nY X-Received: by 10.28.91.68 with SMTP id p65mr688793wmb.119.1516682028070; Mon, 22 Jan 2018 20:33:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516682028; cv=none; d=google.com; s=arc-20160816; b=zd+/ZsXV3IkR33gFNT5XyKjYjxaQW7fZ3/mRE8VatPyrhYHhQoEJHas2DfkQWBdxyZ Rkek6K6Xfmf89VBqqnm8R0tpQv53Tsa11h+qOqnoZN/UbJDYE6rj5+35OAIE2ftaYeOz B40MLvA0qQXyQFzU+vXxq5XBE28Vn7rXz7JNyiEFFR2x4bIXKiDzVzqNEpIs/NFXz6sy DcMvn2qqSoGcUujz1GfCeEwMAZu/92qcDRzSKePFkiLu5W18H0mxo1WS5FZKsaxBcYDp 3/rj5dNoUCTjnD6xHnfZ+ZCdO5XkmWF9jZZS8NP3WiPWOLRlS+9ZJC9+TSCeTYqiDECI 9iZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=zqvp+G3a3KIgn2+JC2EOl1D2VrTLUwY3gow5MX9YFTo=; b=Lig2LmEagrC3duYcebpWXbo1WuUNgcD6yHAGBZnx+7G/pQoHJ4L/s6coBcV826ohDU i4qnYwz2qSEEKuaI/tmVrx/0dHaGYyZYQWeu3EerfQllNbm/xlfUag8FahtlMuHVp+HO PNyawtnrCzay6E/qe/zXUV2xRwcjRIuSLOEhElmqK8j89YYi0EtpV3vwRJulESKHwEjk kBZPg2TtttCgDk7AtIOWtp2/urnlTUTAC2vISg0tbksPvDVHMIt6b7j57dAQo6N2FIWj J2TOQMHGrk5IPGrF5ejH22gD7avmzx9YbL3O739hSP6/2y8WfiuGSimuKmklr4A5EVqy 6m/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iakVcw8l; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 131si6156052wmx.111.2018.01.22.20.33.39; Mon, 22 Jan 2018 20:33:48 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iakVcw8l; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D1418689A84; Tue, 23 Jan 2018 06:33:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFDB1689A0C for ; Tue, 23 Jan 2018 06:33:28 +0200 (EET) Received: by mail-pf0-f173.google.com with SMTP id y5so8816269pff.13 for ; Mon, 22 Jan 2018 20:33:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=u3+xPcSIEwyz29y14PdHEq9526JEQAgcecwiXs2ZuOE=; b=iakVcw8luYZZiALGu+6uDXVZnHTZ/aL5LYDkpowQfNIttWAr1K6rrLfmdSLguoSFW3 o8IyT4TCiXzZmpPayBHBRN5VIkqS4O9ftN9DeYXJqlEmhhbS2Vb55WF+LMJ+GuzpnG6S q9Ebljh7vrlVMvjWpc8uhQ8I4poQaREA7PVXxYhmLThvx0gWJlX3Ek2rPWy+T9GRavLo QzeB/y6xV0TdC/3W9ChrEFxA2KxZgq/W2rA+xr695jVAVsitsPKVJla3thGWp62NlCZ9 rhYDaMf3wblLaPGQUsZ6AfiXRMymsQF9HLFb1Xn8QSa4q/erSNdaIxBnzrT1mo8zfkHd NX9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=u3+xPcSIEwyz29y14PdHEq9526JEQAgcecwiXs2ZuOE=; b=AS46su9l6xv227k71NHvLbDWgGrXe4LL17QHYPnWFHs2vlDCTqkocuSEyK8iU2HRwz QJeo4I5lHf//LFapjZGRTYoASVIzc0W+giV1pndIVpTotaJy8M12248Ei2G3b3dilr05 s3i/nIHfEFIsgRUuk04umL1Kg8CvK52i4LmgwIDpi0E308JcktRPnPfE387Zt3+cj+lz l41QG8AtgXshaPH+bRkZ8by9ssZFSkBGfTSWrkkqp6H3gCkdxP6UTN1aUp/6aTV9agDP DRh9YU6KtqeF/UhVmfUTO3sem1/Jl+bDdXNhWChBQ//r/2ZXIly3302QQx1yODeNBIZ2 u9vg== X-Gm-Message-State: AKwxytdXx8tR/SyHe3xEZcwXOn0yUJZ4VoU8hYMcVEWwVYF8KpoTanC5 7QTRaTaCNYKZ+Q/bLJRh/kA= X-Received: by 10.99.117.1 with SMTP id q1mr8033191pgc.350.1516682009737; Mon, 22 Jan 2018 20:33:29 -0800 (PST) Received: from [10.67.68.20] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id d20sm3135730pfe.166.2018.01.22.20.33.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 20:33:29 -0800 (PST) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <03074839-c99c-e69f-1abc-7cd9efd5118c@gmail.com> Date: Tue, 23 Jan 2018 12:33:26 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 2/4] lavfi/deinterlace_vaapi: fix typo and add check. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 92294e97ffee609a2cac298f3ff0b51f3e3e37ef Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 23 Jan 2018 11:24:53 +0800 Subject: [PATCH 2/4] lavfi/deinterlace_vaapi: fix typo and add check. Signed-off-by: Jun Zhao --- libavfilter/vf_deinterlace_vaapi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_deinterlace_vaapi.c b/libavfilter/vf_deinterlace_vaapi.c index 9700f85817..97b1d77840 100644 --- a/libavfilter/vf_deinterlace_vaapi.c +++ b/libavfilter/vf_deinterlace_vaapi.c @@ -33,7 +33,7 @@ #define MAX_REFERENCES 8 typedef struct DeintVAAPIContext { - VAAPIVPPContext vpp_ctx; // must be the first fileld + VAAPIVPPContext vpp_ctx; // must be the first field int mode; int field_rate; @@ -285,8 +285,10 @@ static int deint_vaapi_filter_frame(AVFilterLink *inlink, AVFrame *input_frame) av_log(avctx, AV_LOG_ERROR, "Failed to unmap filter parameter " "buffer: %d (%s).\n", vas, vaErrorStr(vas)); - params.filters = &vpp_ctx->filter_buffers[0]; - params.num_filters = 1; + if (vpp_ctx->nb_filter_buffers) { + params.filters = &vpp_ctx->filter_buffers[0]; + params.num_filters = vpp_ctx->nb_filter_buffers; + } params.forward_references = forward_references; params.num_forward_references =