From patchwork Thu Feb 4 16:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25387 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 3751444B84B for ; Thu, 4 Feb 2021 18:08:45 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1427C68980E; Thu, 4 Feb 2021 18:08:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D67A0680371 for ; Thu, 4 Feb 2021 18:08:38 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id a9so6300719ejr.2 for ; Thu, 04 Feb 2021 08:08:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vr4koWvH15dHoF/uraF3WS9dYYvE8r0P2CW+minODpo=; b=tnoO/TNxsGg6h3Sm39Y0DePyS/rSL79IT1H4QckBYlxWsndFNrRf8qmWW669EGW3Fu /qvIK4kUV6xWjEU8ogRu8pISXxezqHHI6Gv3i22W1fO9HnT4ZaV/NV1V09q+lsnvZit5 BOPF0NAMGXRcYCgUKrsbZa4Uo5IBH7IVMa7Cn0Nw+33sDbzH6N8rzLuU4XSTTXN8A+pD v8ZuJZ8+XPDT98KcuSGYCqf/SjMdcY/nvlSSoAUH30xeuZcRWV0HZkhQ+kHddOEj4qm1 lg2e/Hd9iX2kS7AZAROpBQX2cjqBcF2q7DBmQ7fiUL7/bOgVIMb7mQziNrAKbSclCpFD 3djg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vr4koWvH15dHoF/uraF3WS9dYYvE8r0P2CW+minODpo=; b=glgvbO9iFJuXmGfnwW6SC2MTM3aiFTxFpb+Sfj+YUHxs11a49IlfE3aDcp3XuvN/Mu hnutmK2QWe409j9kxTwvK4dE+7rYsui6q+5GtFtFym86xeA+2ZW4cHQ/pS2mB7fxdyV9 c94vO3c0GP8aICrjyPgqNdHL9wKbwjEYYC38eGPpBq0qWyLl++zoxfI+1cBvqwq1FsOC 47l09+cYu+K9Yc1HCUWxBlNn+jnHcs13EB8/H1sWd5JUO5hQcaDBuZUKXQFQl2A7cW9F aTFGGtqn+xttJRDYkf+XQN1NQQFXXEXoC63z99III2C2KAaV8tqVT+Vxd69jxmac/Usw CNOQ== X-Gm-Message-State: AOAM531I5e+5Hc9IApQEUDfJhP+ahax2+CaNDWOWRG3b1p3HBByMCFoL V7kDgz6Q86WrrXhNbrvuEb1dKa4w5S4= X-Google-Smtp-Source: ABdhPJwHh80x/HjtRiLEA5PPsLm7L1Z7kY4DhXJo3slzdn9ULlDU8or1FHHjfV0zwvr2cY6LtYpO0A== X-Received: by 2002:a17:906:f950:: with SMTP id ld16mr8664662ejb.553.1612454917694; Thu, 04 Feb 2021 08:08:37 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id h25sm2659710ejy.7.2021.02.04.08.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 08:08:37 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 17:08:26 +0100 Message-Id: <20210204160829.1214634-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/mpegvideo_motion: Improve check to remove dead code 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Several compile-time checks can be improved because mcsel is not used for MPEG-1/2 (it is only used for MPEG-4) and because MPEG-1/2 is the only user of ff_mpv_motion that uses MV_TYPE_16X8 and MV_TYPE_DMV. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_motion.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 58cdecf83b..d065542967 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -306,9 +306,9 @@ void mpeg_motion_internal(MpegEncContext *s, if ((unsigned)src_x >= FFMAX(s->h_edge_pos - (motion_x & 1) - 15 , 0) || (unsigned)src_y >= FFMAX( v_edge_pos - (motion_y & 1) - h + 1, 0)) { - if (is_mpeg12 || - s->codec_id == AV_CODEC_ID_MPEG2VIDEO || - s->codec_id == AV_CODEC_ID_MPEG1VIDEO) { + if (is_mpeg12 || (CONFIG_SMALL && + s->codec_id == AV_CODEC_ID_MPEG2VIDEO || + s->codec_id == AV_CODEC_ID_MPEG1VIDEO)) { av_log(s->avctx, AV_LOG_DEBUG, "MPEG motion vector out of boundary (%d %d)\n", src_x, src_y); @@ -853,7 +853,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, switch (s->mv_type) { case MV_TYPE_16X16: - if (s->mcsel) { + if (!is_mpeg12 && s->mcsel) { if (s->real_sprite_warping_points == 1) { gmc1_motion(s, dest_y, dest_cb, dest_cr, ref_picture); @@ -915,6 +915,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, } break; case MV_TYPE_16X8: + if (CONFIG_SMALL || is_mpeg12) { for (i = 0; i < 2; i++) { uint8_t **ref2picture; @@ -936,7 +937,9 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, dest_cr += (16 >> s->chroma_y_shift) * s->uvlinesize; } break; + } case MV_TYPE_DMV: + if (CONFIG_SMALL || is_mpeg12) { if (s->picture_structure == PICT_FRAME) { for (i = 0; i < 2; i++) { int j; @@ -969,6 +972,7 @@ static av_always_inline void mpv_motion_internal(MpegEncContext *s, } } break; + } default: av_assert2(0); } }