From patchwork Fri Feb 5 07:21:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25450 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 3C22F44AE13 for ; Fri, 5 Feb 2021 09:21:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1112F68990E; Fri, 5 Feb 2021 09:21:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 761FB6883B3 for ; Fri, 5 Feb 2021 09:21:26 +0200 (EET) Received: by mail-ej1-f50.google.com with SMTP id bl23so10213287ejb.5 for ; Thu, 04 Feb 2021 23:21:26 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=ER4pF+MCozZ+ySS09YVuhLPveWFURwrfGRInAexxK6U=; b=En5EIJSxgYLik1Y8AXYA91nMGs3X2hT8XEWz6myoSVqknkAt+TBYOF/o903kdfwTuZ yqy6lC5DAnAJJnWGThrXBp2yKx0Ff4BMiBG6gYwZnXJQe2qbI+wSjm4zd59sCSJIuW9R 3f31FS+f4ivZ5ctHxNthG87tB7hkDyncEUdUq0YGW2s6c3NiJfCNFU/OwC6P3lFUYMzn WSLIGRblDrjs0XLzFpsuOOQYtE/ZlsSDBYHvg2o1wtGLaI40cvc/WjwFTo5SUhg3qZRR f3NbPSTHvSglg6VSDCvX+Pc9jiuoILveOW6nHynnPTsqPqPAyEF2adl0ft7KKDM1CkXD 55uQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=ER4pF+MCozZ+ySS09YVuhLPveWFURwrfGRInAexxK6U=; b=dXj5Cztf7shyHnBOPOzEk+WqW5HvTOhSvJnoEimdpvve569fWrH7diqVx1u8h6khHW KYR5JN8rkiB0s0pPzAJ8V9hcu0CUpZrUDOWJOe6N8sXBHaAKmXPzlOWqYQm9jgBQRyUx XoyEkC5ttzEOmqHxhboKebtLIuQdDoQCM7Gu8AzwGa5d8VRn4RlfJVQF/zCxolbB7hJl JJ2sw062KS4BCdePpnWUex5TKgjqDeNWvgrq8M3mHqt3zJwMrWgD20r2BiAwMzzdgI3R 3KC0ML61PPTtRoXhgz8DyCcols47J/5qlYDyP2wjGsPwHqkCKUtoLMoFbS9RdD0avZXx yV/g== X-Gm-Message-State: AOAM532skgR6ydVb2aq+Nt/bEPVZOBDXaQuJSuPFafY/Bjx3q/QJ7oQ9 7ZnD1CD000beIogVPVtPdijl8h+fPVY= X-Google-Smtp-Source: ABdhPJxyXmWuziytI+l3ladxvcSJhIHV82pKPeVVq7U1gm2Z4crTYrwrL6gQnYgzsswm9Wf5KMnQlw== X-Received: by 2002:a17:906:46ce:: with SMTP id k14mr2868583ejs.480.1612509685646; Thu, 04 Feb 2021 23:21:25 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id b6sm3539696ejb.8.2021.02.04.23.21.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 23:21:23 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Feb 2021 08:21:17 +0100 Message-Id: <20210205072117.1305251-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210204160829.1214634-1-andreas.rheinhardt@gmail.com> References: <20210204160829.1214634-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 --- Fixed a precedence issue in the first hunk below. 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..79785df8f8 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); } }