From patchwork Tue May 24 00:06:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35902 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp280830pzj; Mon, 23 May 2022 17:06:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyogMX5kIB2zhw/zhAqLQfhPWbwthMVxswUDtUcfO/i9YMLu+bhxKcXKQZAkI4DYXPzfOCu X-Received: by 2002:a05:6402:3459:b0:42b:7fec:2a57 with SMTP id l25-20020a056402345900b0042b7fec2a57mr1521534edc.389.1653350794170; Mon, 23 May 2022 17:06:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653350794; cv=none; d=google.com; s=arc-20160816; b=UOJrRPqG0yiowznxHbAwsx/nii6s64hpOZpmQEzoo/bHJzR2v0BkKDUyFNyCz2k0Ao zgq4svfYOp2eG7vOuI9wqwPhVXKJIHsqNap1xpNQ6QYOGgJOrI90ctlKeX3JYmKSbZM7 ePBJOmg4TSlibkpRms+20DAyCkPEJRBClH7sP+ZiuoyWWAX3LnQyFjRMWbSzVqGJ7FkN biOebkOqLEJy8gSxB3S/tBv4Ff+z89kcixPpKp0brh7Tt6c03VDfMNfUnqNlv594OHBe Buqin+G2J8L1Ie9b8lsXhRlUxEPAg87+Vccq9H2Y9TmqGScnmYz+PBlwgbdE1SC7IeWj LIvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to; bh=M5mUPbOz+C2wde52pqAPvoECv+flixNgZ0ea6wna+iw=; b=kcv4jhaQ718ZhUYp9vRNOrAEZ+LFR97auW7oWR3/bCV1yTl+t3pfmhcQ2stFWzBBnz 7tna/kBk+ruNZw4TpRLDOmlkkcodzE1VcoiD7iEv51O+aGJ0uGjN+wVyO0nq5oaKDN7G DdjYH0xy4xIsolIFxqGjLDHlF0ho7GtO+mzrJeHzOL1ApcvnuiycNCWIwW+QMJi6RplD SRSkyRMCH9ctNKOHm+kGqQFtLFv6800zvxd91Kg86TdcShjLkG6MFNlog2+Mp1q8mM6/ NHzJnLiP5lbVvr5SxT62Wte4dBpu0xWRqs05M//LbLs9yHD8G5YYaE7ABsNFgfmBfTjI 8uKw== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13-20020a056402084d00b0042b30589cbcsi11552571edz.249.2022.05.23.17.06.33; Mon, 23 May 2022 17:06:34 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DB30768B50B; Tue, 24 May 2022 03:06:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-1.mx.upcmail.net (vie01a-dmta-at03-1.mx.upcmail.net [62.179.121.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E62F268B46E for ; Tue, 24 May 2022 03:06:22 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ntI3z-0003q3-VW for ffmpeg-devel@ffmpeg.org; Tue, 24 May 2022 02:06:15 +0200 Received: from ren-mail-psmtp-mg01. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tI3zn0D608s8UtI3znMobT; Tue, 24 May 2022 02:06:15 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg01. with ESMTP id tI3znqPpXOPqFtI3znMfhW; Tue, 24 May 2022 02:06:15 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=OcX7sjfY c=1 sm=1 tr=0 ts=628c2177 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=rfChU1pr-yAfB0rsrKMA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 24 May 2022 02:06:14 +0200 Message-Id: <20220524000615.5264-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 X-CMAE-Envelope: MS4wfOA84ibiEDJZN+7ZSXhwnsBdTJYcvtJ2jJPHxJEwKsgw2r+Py00CnIGVK9ine4RojKEm5UWkhPsQ8QO9PtPipw3TN3mzNuYhohs8mtFw/GPCxllDDXUp b6Eww0U/gS/SXDbhvYeQKbQ/HOoDxwQ2gynpbL75HbeRcuAxeC07NYJaV0LFU5BxA6LCvA0OIQVBCg== Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/vc1_loopfilter: Factor duplicate code in vc1_b_h_intfi_loop_filter() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: tVTcfmqbGtHk Fixes: CID1435168 Signed-off-by: Michael Niedermayer --- libavcodec/vc1_loopfilter.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/vc1_loopfilter.c b/libavcodec/vc1_loopfilter.c index 0f990cccef..ee694ede28 100644 --- a/libavcodec/vc1_loopfilter.c +++ b/libavcodec/vc1_loopfilter.c @@ -1125,10 +1125,7 @@ static av_always_inline void vc1_b_h_intfi_loop_filter(VC1Context *v, uint8_t *d dst = dest + (block_num & 2) * 4 * s->linesize + (block_num & 1) * 8; if (!(flags & RIGHT_EDGE) || !(block_num & 5)) { - if (block_num > 3) - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq); - else - v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq); + v->vc1dsp.vc1_h_loop_filter8(dst + 8, linesize, pq); } tt = ttblk[0] >> (block_num * 4) & 0xf; From patchwork Tue May 24 00:06:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 35903 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp281159pzj; Mon, 23 May 2022 17:07:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrF4wN7EU4UHuL5Jc9R/dxy6ZouPyPtEa5EHOwq9qbZI9/toKZ8iie1IyzKBLdLUKTRIn5 X-Received: by 2002:a17:906:8465:b0:6fe:9e9d:3938 with SMTP id hx5-20020a170906846500b006fe9e9d3938mr19511552ejc.326.1653350845323; Mon, 23 May 2022 17:07:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653350845; cv=none; d=google.com; s=arc-20160816; b=0/WDo3oYRjQ0lVLTeGa91Zcfdtuqrl5Z4ViFcr4Ys9j/hu5aAchCsynja8pCey4W+W b63YK1Gy1JzhWGbadziiJPzH75E4dslw0kfLgtLls5MsQTgFmZwznnrZeU4jFgUwruyc Znbrmd6Ln4H6evhqlSqG0jLX91aitspt0tZ2+bpGOK+nLP3HLME1VznoxCmTtI7p/ZW+ mNcjoL4sCEEzJxcFMhpt2ol4bQNWzIbv+OPt8Ig9K1dH3G4LgksViM26NL0ihsJnBIsB L8alecfgmnpCbhH1z+AbhaU9TBKKA7cjzNgIi+YYLArf2oLOJ3hvqr/8lrdu+61CMEQN qV4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=nXhNfsmeOYghSXwbZ3sWG760YgU3ZC8kPOcOYf933OM=; b=OZP74bd5ekKxGMYd57Mn9AgpJxyZu+BkQF8ocyKk1lhrqDgRAyI9Av77mrUeCWr402 Ev7Sv062+4PP2ccL7waL5KUYnQzGfNJYshvt/Uc1+5xpcUK/n6d55VG675YPwtH54Ztw XiccgddGwGXJYXdGvQ59PRN8PopEDFdvzlxER3BUVTzEoIuCK2e65tdpIfVSjEBQ9FED r/Sh51rBCSDm94TCuyRJkNqxBDko+GsahYHxnWXxW8Rl4yHkbyOwGIEcjk2ql7258Py7 Pj5rgmTbWqNkulwI5yTpqdGhQBwx5qAOTCgXRoxa3Lp2VZvrDGXrNh9Ky+AausXnjAY2 1jsA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fp31-20020a1709069e1f00b006f51c67b74dsi13106009ejc.851.2022.05.23.17.07.25; Mon, 23 May 2022 17:07:25 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F3FFA68B511; Tue, 24 May 2022 03:07:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at01-2.mx.upcmail.net (vie01a-dmta-at01-2.mx.upcmail.net [62.179.121.146]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 248E768B33E for ; Tue, 24 May 2022 03:07:16 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at01.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1ntI4x-00AXuD-4K for ffmpeg-devel@ffmpeg.org; Tue, 24 May 2022 02:07:15 +0200 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id tI4cn0DrH8s8UtI4xnMoj1; Tue, 24 May 2022 02:07:15 +0200 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id tI3zn31lL8eSWtI3zn0O1U; Tue, 24 May 2022 02:06:15 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=KKE5sHJo c=1 sm=1 tr=0 ts=628c2177 a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=jMkcRSniPkpubY0t4e4A:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 24 May 2022 02:06:15 +0200 Message-Id: <20220524000615.5264-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220524000615.5264-1-michael@niedermayer.cc> References: <20220524000615.5264-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfGFa5p1chuA4r/Bfe5wA1zg4/l6OrB9h3Eptvc4A8RCbEIlOqKBIIOdZObRcjgLvSdUwNq8gAVydW5ficaidfoCSeHIfNveIHDY0jPyMGCCbhexq7wIl +9XvIA/VHA6HP3wvg0gHtkaTAU8lMy7wT43LvR0xpVhWKrQJluZz0vT24tPKJ7luGiDpAW0Qch9NHw== Subject: [FFmpeg-devel] [PATCH 2/2] avfilter/vf_tpad: Mark unreachable code by av_assert() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sKVL2onTGFry Helps: CID1440835 Signed-off-by: Michael Niedermayer --- libavfilter/vf_tpad.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_tpad.c b/libavfilter/vf_tpad.c index c870478158..1a41c3f1a7 100644 --- a/libavfilter/vf_tpad.c +++ b/libavfilter/vf_tpad.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/opt.h" #include "avfilter.h" @@ -159,7 +160,8 @@ static int activate(AVFilterContext *ctx) frame = av_frame_clone(s->cache_stop); if (!frame) return AVERROR(ENOMEM); - } + } else + av_assert1(0); frame->pts = s->pts; s->pts += av_rescale_q(1, av_inv_q(outlink->frame_rate), outlink->time_base); if (s->pad_stop > 0)