From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 70FFA4F0D7 for ; Sun, 15 Jun 2025 17:00:28 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id A95F368D8E9; Sun, 15 Jun 2025 19:57:33 +0300 (EEST) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E806568D8E3 for ; Sun, 15 Jun 2025 19:57:26 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7425bd5a83aso3230399b3a.0 for ; Sun, 15 Jun 2025 09:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750006645; x=1750611445; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=xAS0cOyxOKQD500BR3O/W3TbKURfzh8Sfj5kNqveIlQ=; b=BDS9t51b2NNnIbcOVrAyfKBWTANcL84wmLyZTf89wSNyVGPf98P/8FxRgFSfvhMuYk fuDrQkavjCBCwCCDbfu4MJmqQWG9dVQcnAgl0AOq/IFVN6LBJZp/DtDmEudvzf90gVDQ keuYHGziYwEVoVWOyGGo4RyH/veEHh9cayYAz+t3ZidvG+nX6hbRcZp86gDq1Kf6Ndc5 mmTLKZgGG2UfyPPlMfP+vor6D9zOluvuGdvQ80fqsCs5H1EozQYjRh0WE2YmVvKZ5x7b NuuT+fzuU+5X2uWY8vgZQj/x/RAIkI0vgVG86pim27o0jploOSvtRE2EQIJTOKNEu2R2 6kBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750006645; x=1750611445; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=xAS0cOyxOKQD500BR3O/W3TbKURfzh8Sfj5kNqveIlQ=; b=j4WAkxNaaatjdPOtuclPIydqYw0DzONyWHPv25ivV/n6iLkKTsZtCDOZRClUl35+GS ew6Tn7Qf10ybBp7CuWwVaHnPfQj8h0t0I4zmAjqq6tb+ibEDfeOV97nsXvbfNzskU7ay Vi6o+xC6qBSu9C4eMJRWcCPijMauCJ5jyMimk0wvDP1dG/TXbdm3h6LBvWlnXaUdSIGH aK40HtViWrMfJPD+VR+fBxR9X43a3Rfvub+d5kz7lOPZVHggFlyjv5sziLRaKiSB+BuO SSRxfufSJuIWi9Z2YwuP4RCdxCfli7P1s40td6UAQFDsi88NulFsv3QbxvhoizGfdPox lvNA== X-Gm-Message-State: AOJu0Yyru1Td5GRfFWQ4kIsUkfQ1crsj6NvC2o7CpzXX8dBaueF7GxHO 5DywCX5tQ6a4N0OhqR8OjwEhnsnDNMhn27L+W8A6AzDfgQMGjcDR4ZEZpBv7zA== X-Gm-Gg: ASbGnct6RAU1o+L85Y39V3+wvUgbtFUpiAQnk9m/xAPhzmIMqhyPYez7ueRhFuwSwjO MYTEp4wyEnzmD89nuGRndAfK5B7eXKG6VwGwV+zFWlv6wIdoP9mdiRWfr7le8opcQxln2hv5xno lxwPfwll+MU26ORooj8kX2JUCp+4+MD6dhLYwr4IKtvm9UmCzdj6ZRSDG85APiqrpI4VQOseb/V twPCzacOMT9HxVuB6TaP7FDT40Hs4Tv4alof/NFwIbTFCnoHZbe5LLwY3N5bZEpgfjcETxw2FK1 A3p61OIDZg+5OmtC7AGWXgUZxIufRIS7HafUUaznCLPvD3CHE3w4AgxtmVk8FdxkBHqwIq6fD8n w5DGDRBSsUcAFvl4H X-Google-Smtp-Source: AGHT+IHcOB+RVroRNqPBALUVfgukTyFTpS+5ELKdNmj60ySPyPFQBDAN/zW2v1jKOT8X0rB5ilwEKA== X-Received: by 2002:a05:6a00:4613:b0:740:b5f8:ac15 with SMTP id d2e1a72fcca58-7489ce46ea2mr7717375b3a.10.1750006645052; Sun, 15 Jun 2025 09:57:25 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-748900d29a2sm5244579b3a.175.2025.06.15.09.57.24 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Jun 2025 09:57:24 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <6fe070e8a34fec0642461ff7777c6594a14b6674.1750006479.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Sun, 15 Jun 2025 16:54:19 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 28/47] avcodec/ituh263enc: Simplify AIC handling 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Andreas Rheinhardt Namely with block_index and block_wrap. Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index ae67907722..8126bf5c84 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -572,26 +572,17 @@ static void h263p_encode_umotion(PutBitContext *pb, int val) static int h263_pred_dc(MPVEncContext *const s, int n, int16_t **dc_val_ptr) { - int x, y, wrap, a, c, pred_dc; - int16_t *dc_val; + const int wrap = s->c.block_wrap[n]; + const int xy = s->c.block_index[n]; + int16_t *const dc_val = s->c.dc_val[0] + xy; + int pred_dc; /* find prediction */ - if (n < 4) { - x = 2 * s->c.mb_x + (n & 1); - y = 2 * s->c.mb_y + ((n & 2) >> 1); - wrap = s->c.b8_stride; - dc_val = s->c.dc_val[0]; - } else { - x = s->c.mb_x; - y = s->c.mb_y; - wrap = s->c.mb_stride; - dc_val = s->c.dc_val[n - 4 + 1]; - } /* B C * A X */ - a = dc_val[(x - 1) + (y) * wrap]; - c = dc_val[(x) + (y - 1) * wrap]; + int a = dc_val[-1]; + int c = dc_val[-wrap]; /* No prediction outside GOB boundary */ if (s->c.first_slice_line && n != 3) { @@ -607,7 +598,7 @@ static int h263_pred_dc(MPVEncContext *const s, int n, int16_t **dc_val_ptr) pred_dc = c; /* we assume pred is positive */ - *dc_val_ptr = &dc_val[x + y * wrap]; + *dc_val_ptr = dc_val; return pred_dc; } -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".