From patchwork Mon Apr 29 00:35:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1698703pzb; Sun, 28 Apr 2024 17:37:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVmmwEX9Ogb4kUiXJ8JKWLsbfUHhZUUc3legmUvJs0KixddIUBlAM9sRWjDFyfibTnSGE7MvIuSimHTEbfQSiNZsMPBvHABNcw0DQ== X-Google-Smtp-Source: AGHT+IGnqXlKjp/nB5pe2OOW2mV6OXHZv+gFeVKt4zH3TpXYP606Dz/9ke/Ti/jB/voXykXW+5sA X-Received: by 2002:a17:906:fcc2:b0:a58:e75e:b059 with SMTP id qx2-20020a170906fcc200b00a58e75eb059mr2782087ejb.0.1714351027025; Sun, 28 Apr 2024 17:37:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb41-20020a170907962900b00a55b4327492si10271899ejc.47.2024.04.28.17.37.06; Sun, 28 Apr 2024 17:37:07 -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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=LInznc3I; arc=fail (body hash mismatch); 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=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BBC0468D48D; Mon, 29 Apr 2024 03:36:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2048.outbound.protection.outlook.com [40.92.59.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4421F68D451 for ; Mon, 29 Apr 2024 03:36:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=efu7SuZIE+jcEb2noF1Q2XQZtKI5z9z1Wb/0KExWatnpLCc2KD6Op2+d4AvYt2PXw0ohwymM2GAaEFF1TW/pXUAVzZhLl4Mveu8054v9gSYqxMXbzRqeuB9WXOfIxaUYy0ER1oItBvizNxqybtY/oWm6ooCniYiKJDigHCGUf5VPH58J69lE5jYskKMtFiUpOhfbzd9Qh6Ci6A7IDQlwrWvylG9/5GBE0QIBrhUHsHLDE79PrOSo8MkxED48ZAbJ3RVcIFYacKzlgcoWUIqDumImruhd2YGkUJYZ+QUjIF0lOBNGvxzF/Z1cPVh2m8+c+9vKFO5n4PM7vGjnuNqP/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xbZydppQo+QovgH24SqZphBuJoxt6Fl+MbneubbKJbw=; b=T9mfyEa8VCpfgpQGuy4ceU8AV8utX9rXSw5uNyjd/CozvHKSUW2am76OQXuDX+Vt51NnnV365vGVeDTwXjIMtCSGU+6+Wy++j0QLTQjv5DbFfqgN35AGmXUr+yfsYrcpGOzSOSxtNg0Bf0tRKwgR2hrSnq/feSNVmYunTMi4qnCzpgn9nNIqnsB4ZYH1RPmLs3MjXrhhKk4+zsf3kBLrGJaLTXYZvfhBp/AbJ5VwGvzZv+UCZLgBdmO5pb3XdCj6xIzGLcar1OqcV2fCko/PvIA+UJqVSbYbdOMm3nY6cwpkJMqlXLcepZr1kcql60LP11r5sCjvnPHPuqTk2Dmb4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xbZydppQo+QovgH24SqZphBuJoxt6Fl+MbneubbKJbw=; b=LInznc3IdEQrFHOUgRAoSFf1U5mS+OH37BjrAsqU+EpbD4Ikj5i734Aied1RX6kyRtqMo9+sbUzelVfBdanG3w2ABVCwpX3IlwEMhFeqnfKJKVlyx15iCFt4VfxPrTFOXxYdavokDl+6xg5PIotEm1xn7WJTkx1nnmP8JqC5DTCEIGRokQoe9gl5r4hhMw/RNpZnx7rHVcOIDWntYmEoe3Dzh22aQiCXGScejwvIh0HWDg0+fNhtripxPUncFVUUp28DfEs5bJCRElFXV9MFkao6J0GSXNFR+GJq//Z2XW/EUDeqeACyPfUf7GUrqQBu1g+kp34umjfMG+MIJs4CAg== Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) by PR3P250MB0068.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:173::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.34; Mon, 29 Apr 2024 00:35:56 +0000 Received: from GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd]) by GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM ([fe80::4eb:f54f:b451:34fd%4]) with mapi id 15.20.7519.021; Mon, 29 Apr 2024 00:35:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 02:35:32 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [IeSkl9HeznoOSd14B7UPli1I7vLpe3juMslHeWyUr2Q=] X-ClientProxiedBy: FR2P281CA0080.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9a::13) To GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:60::6) X-Microsoft-Original-Message-ID: <20240429003535.1516058-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1SPRMB0021:EE_|PR3P250MB0068:EE_ X-MS-Office365-Filtering-Correlation-Id: de2ffe4b-10d9-4e07-e1db-08dc67e4555b X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: XdmNIEn6He6MCKnQ45B7SDHckWQWnuGdIQTrfX6CG9hbFju15u04IwtiKOc6YLJXlLJij8zgXOxe29je8Qxbyrh3uCueAGUyEbOsCZ3q4OAGeNFuHA+UINYS3KzcLcLRX+HBRqstY1RwH10AM2fH8alPaCWAUFCYqLlMlWBUkxvkcS38lbW/FpZ11jV6qPfZlAikvnYFlM9N53QWFs+uptwY/+xx06o/8SjPBYWCkND3qvl38hMnUnLuQeFYT251sygLod1mDHGZ5IG8lfcGLt1ZByh87krs9ZLt0M7i5ufigdo9qzKhfpQ/wDbl7pXlLbLZsrHglg5BkSa+JCzsjsNzvl0GTmwoGNylP0WB9aTOASKbl4Eo/2DqLMA7vnAz+wUxt+duZ02jbbatLz8jYUZqVSc8hA9vt6P9a0lnDlH/b7/9j7Ltk2H6l9RMPuquu1fxwI6OehhsFcEvvNU9USoRT0R/yjJhxcdr6RZtIpQTMoRi4vfhMMEuquFUWkEzW7MP1WHRWVSrwm+FaiSdM0ISta8DDFSc3+DKfEtc49RqzGyJWQ8k0KUUlDhIdTvblt5ncYq4pKLT8f6Ynk3yyd+s9UCs0W7pPZF2fdGRKWezUFwiSu6refaUFSN24vqh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GBnURvCCMMR+0J0iN7+fTNcV8YJ8sQyH1+jD8939sVWxYldq5JyMssTpmMc9CZ/6L5CkQVC2KGKYmYYuhfCaMAsAUDQBtn/OpVBUd1j0ZtmC5fqVVvizOrV09t3mmObfujD5iHZrZKX/XcfGaMbIF0zAuvlUWc1GVKEQccGo6fU0I7+iUgAhZMQ+Jd7cmi96JaBzit5Er1uUTXj3lAoizEYJZfZKbms/dAYbmZf4xpPXSy+y+pQyR0LTsuW+N233p6pmpGV6rEpFkj+nTvYFtQYbwsCYKberDyDksXhktznrbjntqroIMqE9XZVekXuuXPmS/QpC014d4cRfSdSOBytBdQPLZrLa65pJu14SdD+ij9u+YEeVqDkCGisS+zmJ0ewMx3v9cdAUbj9kseQp0dXpIlzI+k03TJMu5puzWweOoulHm4HKuiggZUQSdPnPJyDUWzwIBrA/W5QDQHhF5ega5xUe9hjp98WythXRcu0ACMh/w4xz9L8WOBjoiXoIoNLosWSNxU21voD8JVcuATTNg37NaAtzixC820TLEuc1fAip4Sbec+rhgZ5bhDVduArjdRekolBQm17LIAb15YVVcsE+2HvWwy80vrRCBMNAfME1hd2aKiVWQ0nPlLaIkXf/11Fq/f76wlJ/8OaKP2KBWYBg/5PHnuvDju8SUqXCJfLIKa9byBDjcJsKYJCT2cD7d3EB+H74RALfbH4OjNn6rB2+lzyrehp/CkeGfdesNmUMkBfVt93Gxq8uUO8jBqFV997phyAE2twa3dpzzk0BpQrvR7ilFlQohribiifAL1RIUitHbrVErt+rIQV43f7XBNQCokpHkzJotB8E8EGHtIIgmPjG7Wxza9lsPJo3Mfp0NaJjbwQoXLLtraAYRAmnx/vXBg0KaNt00wX5akXDrLdVGKPOc5EHeSMWY2wOGnbQLDWTJUKpql2m5zFRPPzWZD1I+0QaPJUCHXgOsOdiOMpR9vVvarOV/bhOcNWkfC1dFkshEPnSEdIHjuscHn5Fym+rggj5+WaL79Q6btNzvTLG07rGHvGR0KixuKed2cqzuStFb2SDnvUhqQSKNf/ZIbswdoZd5Tm9FIjdQkyeaa7Lz2VF14dEPvPYKFiNlBhaiA2eO41zTmwWuXFuSCfYXzNxIZFtnJDWZZo8pa9ZjNOU2yahxN0q3YxvNqhXOasV8uef1gutJXZ5CzC87oV0N6U08R6h6QbhVUTMNjxVt2iJUBPZvWpvKLBTtx4YXKw/qBwRmxC/+Z2WeYWjnCUjEbLLVN/OjFenKuIoew== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: de2ffe4b-10d9-4e07-e1db-08dc67e4555b X-MS-Exchange-CrossTenant-AuthSource: GV1SPRMB0021.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 00:35:56.3746 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3P250MB0068 Subject: [FFmpeg-devel] [PATCH 11/14] avcodec/msmpeg4enc: Only calculate coded_cbp when used 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wx6n/lXEDr3A With this patch, msmpeg4v1 and msmpeg4v2 no longer use MpegEncContext.coded_block. Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4enc.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index 119ea8f15e..282b3e958b 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -389,7 +389,6 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s, { int cbp, coded_cbp, i; int pred_x, pred_y; - uint8_t *coded_block; ff_msmpeg4_handle_slices(s); @@ -450,20 +449,10 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s, } else { /* compute cbp */ cbp = 0; - coded_cbp = 0; - for (i = 0; i < 6; i++) { - int val, pred; - val = (s->block_last_index[i] >= 1); + for (int i = 0; i < 6; i++) { + int val = (s->block_last_index[i] >= 1); cbp |= val << (5 - i); - if (i < 4) { - /* predict value for close blocks only for luma */ - pred = ff_msmpeg4_coded_block_pred(s, i, &coded_block); - *coded_block = val; - val = val ^ pred; - } - coded_cbp |= val << (5 - i); } - if(s->msmpeg4_version<=2){ if (s->pict_type == AV_PICTURE_TYPE_I) { put_bits(&s->pb, @@ -481,6 +470,18 @@ void ff_msmpeg4_encode_mb(MpegEncContext * s, ff_h263_cbpy_tab[cbp>>2][0]); }else{ if (s->pict_type == AV_PICTURE_TYPE_I) { + /* compute coded_cbp; the 0x3 corresponds to chroma cbp; + * luma coded_cbp are set in the loop below */ + coded_cbp = cbp & 0x3; + for (int i = 0; i < 4; i++) { + uint8_t *coded_block; + int pred = ff_msmpeg4_coded_block_pred(s, i, &coded_block); + int val = (s->block_last_index[i] >= 1); + *coded_block = val; + val ^= pred; + coded_cbp |= val << (5 - i); + } + put_bits(&s->pb, ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]); } else {