From patchwork Sat Nov 12 22:52:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1399 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.90.1 with SMTP id o1csp415698vsb; Sat, 12 Nov 2016 14:52:53 -0800 (PST) X-Received: by 10.194.71.69 with SMTP id s5mr14270151wju.197.1478991173075; Sat, 12 Nov 2016 14:52:53 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f13si39148927wmh.140.2016.11.12.14.52.52; Sat, 12 Nov 2016 14:52:53 -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=@googlemail.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; dmarc=fail (p=QUARANTINE dis=QUARANTINE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3C4BD689DB2; Sun, 13 Nov 2016 00:52:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53CD4689C5A for ; Sun, 13 Nov 2016 00:52:44 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id m203so5479100wma.3 for ; Sat, 12 Nov 2016 14:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=OObct9K/8GS/4LamB+y2Oqna+vDdzEhvpzF0GzjuFxM=; b=ovo0lSmYWlo2hx3PE5c5Qe7pA8t/+5bZnsjJs8q7wXocpid22jXbjJlvUmX/6x5smb xD5SF52eMZMKl4UCWGQEcpjr2GILm6wdOLnZpy+STwq4SdHsj9w0yduSYfIoBy4bhtYh q0JXSz8ySmG2XRHPDaJ9Fes1568X3ILCOgmY96wXTkCT6iJku7v9v9a2ux3e1WzoHVY/ orGG3ztCFSbcGOwzMfj6rjuCjh2NX71HF7kqW5cq/NgXwoRymJ+zKaQ+fz57MpUQK6Cy KSOdxTAnbb0AKsZlblrVJ511/7/RtknsWa0CusaA5j8wHM+CUC30IIdgfLS9O6U7fEWz 8SSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=OObct9K/8GS/4LamB+y2Oqna+vDdzEhvpzF0GzjuFxM=; b=dFqBvaMKf2/fq4ecO6dwys6jFfBDnrGOzAjybFbt0W38qq2mO323TnWTgZ2lPZivpV E1kyAwQNw5zT8Y3E3llzlUMlpHvPMDEU6ZuFenAKJijv6a1UIVTPipgBa8pYb3XpZPiI T/C7qMgbJIF7TF+6xZTi/sOKShkm5gSpST31yBlU0z9kw28ohc+A4vaA2EX2YLa2f1T1 kZjUMqUlH4a2FYde6MBoby0GzzGS6D8yMOZ5DnR7CIvjmOqXJ8BhQsyTvFS/i/sOjN1E jBVEaK7jMQ/WUs/QLBovtUq1DR2AGadPLR7oZjuLbmtBgSeeL0BHCCE3Xk3sh6q/B5T8 gJFg== X-Gm-Message-State: ABUngvfrnjFaLAVLwaZVhfl+HOaHXbe7pOv+y91zzwubn65lupwAJ+6RYeYUWSBkWAIqBQ== X-Received: by 10.28.132.193 with SMTP id g184mr3850387wmd.130.1478991163822; Sat, 12 Nov 2016 14:52:43 -0800 (PST) Received: from [192.168.2.21] (pD9E8FD88.dip0.t-ipconnect.de. [217.232.253.136]) by smtp.googlemail.com with ESMTPSA id 18sm26845910wmr.5.2016.11.12.14.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Nov 2016 14:52:43 -0800 (PST) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches , "Ronald S. Bultje" Message-ID: <10ac6f98-d4d1-9264-2db5-1d1ab28ad12a@googlemail.com> Date: Sat, 12 Nov 2016 23:52:42 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] vp9_mc_template: disable assert for SCALED == 0 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" The handling of the other block sizes was disabled for 'SCALED == 0' in commit dc96c0f9fc96bf4167633befc074394062793322, so this assert should be disabled, too, as it can now be triggered. Signed-off-by: Andreas Cadhalpun --- At least that would be the easy fix, but I'd be glad if Ronald could comment on this. --- libavcodec/vp9_mc_template.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/vp9_mc_template.c b/libavcodec/vp9_mc_template.c index 38d9a6d..e7f226c 100644 --- a/libavcodec/vp9_mc_template.c +++ b/libavcodec/vp9_mc_template.c @@ -205,7 +205,9 @@ static void FN(inter_pred)(AVCodecContext *ctx) } else #endif { +#if SCALED == 0 av_assert2(b->bs == BS_4x4); +#endif // FIXME if two horizontally adjacent blocks have the same MV, // do a w8 instead of a w4 call