From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 88B0E4A3C4 for ; Mon, 29 Apr 2024 21:21:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0AD2F68D66A; Tue, 30 Apr 2024 00:19:22 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2015.outbound.protection.outlook.com [40.92.91.15]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9644D68D39C for ; Tue, 30 Apr 2024 00:19:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ni3aR6wj6y2yNarSbKAYdHJSm50wGB792kF1+QA63C8dzPnFdnKAppx1JUostShRRDAe5GaNKj/x8h+9TGUbhZzqVWqLWwWK9KL4+FlJcQ+S0iPDQYDuoJJSfO1bZmr2rHY7HoGzj1QP65qLVLWuk1lVmQU13EpesVqiK2LhLxsm+8yEmUbA0wL+847vMzk1tMrevTLn5XG55+s32i8yraylOTtpvsZP7UYUNj80s6W1Z+J193FGVPF8MWaRW8ADaOm9hcaXC50pTRUbyklFCNV8pZ18t+lz5BcXTQVmGRcWfRld1hQvIEJgHy9PRVUP/n+2HHI0wFDqxk+4P0ayEw== 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=cxPyKCOCbwKPfz3yFBQrknU38lUd5cWdF/JVwh2+5Yg=; b=TOX0SpF6WUhPeVnP6z/rgXycYQhP61C+GHli5jDXJejxUkAsVI4Ve0dp+NTwME4nBjtyQPDa5GDvcWZYVI1WDx9Y+EbHLG5KQT2wTSVne8Nva+X+lVAOT7Y+p70NxXQgISGpGiDk1NW8ZLCCDnvfu79WTlFbGN2d5FAifxwuHQJzd8v98+fvezpeVSi93arpFEri+H3jcAIl5Q6fyKscQJKT2YcEzMo+DXv6tSix9eUAI3McfdHCJD5BV5zc8sX2ttP7WlRkKYv3PzXaWFXGpPqnPNhsJaIxWegpb7ZFEfq8tG5xD/5rV2SmMhQRqQRHuhWdUCfhInpGyWPr8NTr0g== 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=cxPyKCOCbwKPfz3yFBQrknU38lUd5cWdF/JVwh2+5Yg=; b=p6mij3AdhuWRDuHhy9CBbQoZS/CPOe+lYCuGs8/Kh/Ytfo3uCPnqpWIXvKVwlnVEMM92Z8QPki0LQvlyaRCOnQ0cWLiSWkZaPVAKa6Tn9/crjkFqunlpZY+4npo13o99+kkoeeS6i2dGD0WSem/Ckf7igRCqBGdD13JPbZGofOTb/jRn5yqhgvOKfnMlbnj1lBz5mwXq1sV+Kn11a4KSc0kKiWgAafBu2dezlH9X7iz7+7fpblTgajAD1aCo7NYIAo5YjB197ALHAUZxCfMZ6aLIJWSU89Q6K1hc+FfPzQw+Xi3a4BI6qTaWI3XRVQwLkNVMvRD2a9eFUWUThMrJsA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0616.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:297::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 21:19:16 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Mon, 29 Apr 2024 21:19:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 29 Apr 2024 23:14:36 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [VcY8GDT9HGEb2eGDamO6lMEJDY4bkN/f] X-ClientProxiedBy: ZR0P278CA0199.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:6a::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240429211438.3274834-41-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0616:EE_ X-MS-Office365-Filtering-Correlation-Id: 060e5cd0-e985-43b7-1022-08dc6892062e X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: CCP/bAtOuVce6bz9ZhF8ncDLXIUiWuyb4E2l8eojc7Z/i2SzmPufrcMnUSkgygAUJhdZaPorMqLvEgg/brH8KbKTI9ChLk8HzdSmVakAQnJz6FnitvPmYzon7VZnoODEZIow9B1pve4n3S8qLDWjL5XX9OdNHwwi+6rCW57TWCt561b7gNZRW4XoHetjk73N9W+mN8gnDZg3dz/PUR5F5NTHereWo/i6GrwrqRGUryaeAkUGKIPVBOMK2iZwPTZ5qFUQNQMj4n82FzfktNMHYykO+lAS6CgJXrzoxoL+peDBo+Wz9sOAyhWpoRJNva4sgNXVqAxmDf+l++EbUu6h1CHvPUq3ek8RDKYOUgNNAphvms8fw2YgLZFkuCGBExWveEyOXD0bH39KthGG9A0AmCPTJljw4+jNjhS0aMV3qdeoHH9eqnKFroBBQxRNA3/jW7Oj8WVEouRm2bC0ARooBPFJwq9Gl1AXRQNckEJxoMmNHQwy3mfQ7awkoIv5l9t0J5PjcX2N5F1Zqd93tUG1QURKl961WK4+6mSKFRpWYEbuy2DFBAH25zfiU4IF+JGshxZm5Q4VSfwqx6jcZq2akVgW1HuGqPcP07hZIEVksTdJA7fBXesTaYMK5qm6LrZz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?d6CGIQQIjWNiKWJt0Dj5Yp/yxYOVuVk852ALLvwcYlcUg+cyCh3dQIIb0nvW?= =?us-ascii?Q?6oqhqKeyX4f5Zt7wckasbPcRoCTpc1N1dLoFBCQALi+thggkualvkR6y3UXY?= =?us-ascii?Q?rxh7zbAH2yZbQk3EXpKsHzRXb9NtPerMIUq5A31wQxb7WI3YfyJZYqUo4GJC?= =?us-ascii?Q?LOTQ8bIzm0EnWTO9usigyrK4rPBGydlQiHctfCC842x1ynzC5N8qgPZTVw9Z?= =?us-ascii?Q?+y88ONC3VUXJyELtagVpEh2XsSc2TUOgKBvtEei3rVHD4vHEyxpVY+/CPW0F?= =?us-ascii?Q?C10ffU5KI+PM5H669DXimU8nwT0ypbHvZXxQIcSfUTAEZ7P//WI42fqlwQdb?= =?us-ascii?Q?Sz0ofhs9jUmv73E5I36y7qmSkuRkFLPw6GvlLhfbPP6MAnu343AvqRkY4dp5?= =?us-ascii?Q?t7hptZDp8oN01it51Y9Tu+JHYp7T/K7PIGQWKFZsIJ4JfJaWhTdqsNdiA52Y?= =?us-ascii?Q?5Sk79bw0lQubKaYiwXnhnkICwYf/gFuFfoQTJpwOA/wL+QQJx4my8eHINLl8?= =?us-ascii?Q?KxnodNzX/g0Bb6dwoo+h8O2OV8Iz617hdiiXaDMuyEfeWYtiuw0OfMSe82Jd?= =?us-ascii?Q?ZivMM60+4R/mHSlCqt9y5F4XPOtWe93Viapm3tz+rdZYuW/7wbEg+dBFFyp2?= =?us-ascii?Q?C3lVbSvrCfwByAIZobJhiAwrFTAnAqMrpb9NUQKkCB/hOzyqnWKyPPzHCi7Y?= =?us-ascii?Q?f1un+hu5GhNZ8e+dA3S/6wXvJE8qqTuDb6/yM+tnfJhs3RbkAvmQ1dFpZ+y1?= =?us-ascii?Q?YL2tjUhfX+WNDFNz3bgMRok+KvsJsGROOYhHWVR0bPU0/a5itRnCtkxBa0Y0?= =?us-ascii?Q?Ee8TTSk2NKUmzSsDO06HFSNxUgkdweIJ+ORIxHduXlmWkmqSgs7KGvLyrR7m?= =?us-ascii?Q?TG5hm5V15dDuyXNVnyeqKKGCISc5tfzk0Yk4vu9eSphLc2Hxll/SmeOiMFti?= =?us-ascii?Q?HxM4LGYJBR1Vc207ToWM+Ipge6x8of2b5KY+55tClXAi0ZS2wd3g8MUTeOEZ?= =?us-ascii?Q?hhdEK1a2hRr9w5pM+CX/0UGHZjGBTuItg9vXz8QCX8YuNbLv+ilyF3q0MPjW?= =?us-ascii?Q?SGlLk5jwX0M+y6kEJ4X3xGI23un+9OC1S246PlJmgU4SXWdhX9ME2AJYsjJZ?= =?us-ascii?Q?BZDi7asz+M5ZEbeUKZi1Ydgdr+kFnUGt7juhCaxgOBrCC6dM7zk61vCUCaj3?= =?us-ascii?Q?fMYHemEmkuLF6Lp2lZWnnu0g4mXO+LvEePW4LlxpYz8wobjTdN5VThLTxv6x?= =?us-ascii?Q?ZXK8BxdzaeTYflFZ1wbGG57fbApyUtBf7mBxTfwvXg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 060e5cd0-e985-43b7-1022-08dc6892062e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2024 21:19:15.9617 (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: PRAP250MB0616 Subject: [FFmpeg-devel] [PATCH 55/57] avcodec/mpegvideo: Remove pblocks 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: It has been added in a579db0c4fe026d49c71d1ff64a2d1d07c152d68 due to XvMC, but today it is only used to swap U and V for VCR2, a MPEG-2 variant with U and V swapped. This can be done in a simpler fashion, namely by simply swapping the U and V pointers of the corresponding MPVWorkPictures. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 20 ++++++++++++++++---- libavcodec/mpegvideo.c | 22 ++-------------------- libavcodec/mpegvideo.h | 1 - 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 55e3a31e95..139e825216 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -535,14 +535,14 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) if (s->codec_id == AV_CODEC_ID_MPEG2VIDEO) { for (i = 0; i < mb_block_count; i++) - if ((ret = mpeg2_decode_block_intra(s, *s->pblocks[i], i)) < 0) + if ((ret = mpeg2_decode_block_intra(s, s->block[i], i)) < 0) return ret; } else { for (i = 0; i < 6; i++) { ret = ff_mpeg1_decode_block_intra(&s->gb, s->intra_matrix, s->intra_scantable.permutated, - s->last_dc, *s->pblocks[i], + s->last_dc, s->block[i], i, s->qscale); if (ret < 0) { av_log(s->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", @@ -760,7 +760,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) for (i = 0; i < mb_block_count; i++) { if (cbp & (1 << 11)) { - if ((ret = mpeg2_decode_block_non_intra(s, *s->pblocks[i], i)) < 0) + if ((ret = mpeg2_decode_block_non_intra(s, s->block[i], i)) < 0) return ret; } else { s->block_last_index[i] = -1; @@ -770,7 +770,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t block[12][64]) } else { for (i = 0; i < 6; i++) { if (cbp & 32) { - if ((ret = mpeg1_decode_block_inter(s, *s->pblocks[i], i)) < 0) + if ((ret = mpeg1_decode_block_inter(s, s->block[i], i)) < 0) return ret; } else { s->block_last_index[i] = -1; @@ -1279,6 +1279,7 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) { MpegEncContext *s = &s1->mpeg_enc_ctx; AVCodecContext *avctx = s->avctx; + int second_field = 0; int ret; if (!(avctx->flags2 & AV_CODEC_FLAG2_CHUNKS)) { @@ -1362,6 +1363,7 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_finish_setup(avctx); } else { // second field + second_field = 1; if (!s->cur_pic.ptr) { av_log(s->avctx, AV_LOG_ERROR, "first field missing\n"); return AVERROR_INVALIDDATA; @@ -1389,6 +1391,16 @@ static int mpeg_field_start(Mpeg1Context *s1, const uint8_t *buf, int buf_size) if (avctx->hwaccel) { if ((ret = FF_HW_CALL(avctx, start_frame, buf, buf_size)) < 0) return ret; + } else if (s->codec_tag == MKTAG('V', 'C', 'R', '2')) { + // Exchange UV + FFSWAP(uint8_t*, s->cur_pic.data[1], s->cur_pic.data[2]); + FFSWAP(ptrdiff_t, s->cur_pic.linesize[1], s->cur_pic.linesize[2]); + if (!second_field) { + FFSWAP(uint8_t*, s->next_pic.data[1], s->next_pic.data[2]); + FFSWAP(ptrdiff_t, s->next_pic.linesize[1], s->next_pic.linesize[2]); + FFSWAP(uint8_t*, s->last_pic.data[1], s->last_pic.data[2]); + FFSWAP(ptrdiff_t, s->last_pic.linesize[1], s->last_pic.linesize[2]); + } } return 0; diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 17516f6fab..3cb8d06914 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -365,8 +365,6 @@ av_cold void ff_mpv_idct_init(MpegEncContext *s) static int init_duplicate_context(MpegEncContext *s) { - int i; - if (s->encoding) { s->me.map = av_mallocz(2 * ME_MAP_SIZE * sizeof(*s->me.map)); if (!s->me.map) @@ -382,15 +380,6 @@ static int init_duplicate_context(MpegEncContext *s) return AVERROR(ENOMEM); s->block = s->blocks[0]; - for (i = 0; i < 12; i++) { - s->pblocks[i] = &s->block[i]; - } - - if (s->avctx->codec_tag == AV_RL32("VCR2")) { - // exchange uv - FFSWAP(void *, s->pblocks[4], s->pblocks[5]); - } - if (s->out_format == FMT_H263) { int mb_height = s->msmpeg4_version == 6 /* VC-1 like */ ? FFALIGN(s->mb_height, 2) : s->mb_height; @@ -484,18 +473,12 @@ static void backup_duplicate_context(MpegEncContext *bak, MpegEncContext *src) int ff_update_duplicate_context(MpegEncContext *dst, const MpegEncContext *src) { MpegEncContext bak; - int i, ret; + int ret; // FIXME copy only needed parts backup_duplicate_context(&bak, dst); memcpy(dst, src, sizeof(MpegEncContext)); backup_duplicate_context(dst, &bak); - for (i = 0; i < 12; i++) { - dst->pblocks[i] = &dst->block[i]; - } - if (dst->avctx->codec_tag == AV_RL32("VCR2")) { - // exchange uv - FFSWAP(void *, dst->pblocks[4], dst->pblocks[5]); - } + ret = ff_mpv_framesize_alloc(dst->avctx, &dst->sc, dst->linesize); if (ret < 0) { av_log(dst->avctx, AV_LOG_ERROR, "failed to allocate context " @@ -679,7 +662,6 @@ static void clear_context(MpegEncContext *s) s->dct_error_sum = NULL; s->block = NULL; s->blocks = NULL; - memset(s->pblocks, 0, sizeof(s->pblocks)); s->ac_val_base = NULL; s->ac_val[0] = s->ac_val[1] = diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 6c30e4119d..43d28a269a 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -467,7 +467,6 @@ typedef struct MpegEncContext { int rtp_payload_size; uint8_t *ptr_lastgob; - int16_t (*pblocks[12])[64]; int16_t (*block)[64]; ///< points to one of the following blocks int16_t (*blocks)[12][64]; // for HQ mode we need to keep the best block -- 2.40.1 _______________________________________________ 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".