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 CB9144A7F3 for ; Sat, 11 May 2024 21:01:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D729868D851; Sat, 11 May 2024 23:56:37 +0300 (EEST) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2066.outbound.protection.outlook.com [40.92.90.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0204668D849 for ; Sat, 11 May 2024 23:56:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KqGDm2kVnEDdimw43hvd46A5eN4st9PcN74V+unBW9HcfaLAUuKAS7RTsJuk0UOGAToMObEUrjzwlUvH8OYib11hCKofgi8CXz63L8Z2rxg2o0jf/tnrZbcQ9ZIyc53exyLMyF4uaYvfpadvHI+V8Ld+ksnVQ7Z1D2ON5B40ypnI/oCq7S5Tv0UtyG3ZaDMBE9MNEm/c+2ZM26yMISTycaLF+mD0SwmTw6zL3MTujo0pg0b6tTa7fBhLgiGzztycp1d3poZamzfQDWYWbXBWBCuIyzn6lF5ev59+RqW2qV4eYzfNuas1K7CaGHPsD+uQx9x0KjVm3MRGqdyy1XcouA== 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=+YCOwgmVqD+fbh+PeE+5AlR0/kSW0z4Ay9oslWXFsu4=; b=U0aXEAZuehLZH+akwEap910/0rXEfaZMKrtQOFj61aWdKwPCRyu/KIzXs5ocdY/KXY4RyBk9Yhs+euk79KeWWhb5QmO2wwjK702QINktIRIAzmzHjBCnI2O0OScKBy11amFliaqBSakAA+IHwj/GnGRy0NsJV4ma66ssaVhB9x8vJGqKMN3s4ByFdtW3Kjut1KHH0mTGxULAYfNXIxiv1h8KcSCzV+VVNh/PzEYoy17q6diiCfmzhFWhT0Xh8H4lOcZNRK+RqCNseY6WUmkMh9iHir2YK2fenOPRyjQmYAJkBneus/k4uJBlUn+pTm9fqOaxYoBUTy+FteqfLxUu8w== 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=+YCOwgmVqD+fbh+PeE+5AlR0/kSW0z4Ay9oslWXFsu4=; b=mTJwBRM5qcMBFPvhimo9z1xiV3kWYmVYJAYbNmMp5S5FIPvyYfHpxvoRZ5LteFrjK70mdi0QuOqVFKq/tZ+kX2ZzK2oh2nODl14Tz3i8VddWZKFRAgNZr/Cr8baMNFrDpF6356UplZqDlnaspqoVZ177nL2eHnlTCH87CcBGNmtKRssk+9MUwYXMoHgb98nPWRtRe7wQP1dWNr/JZ2thNapA6GbkvE2kgVNCaHJ5vv1x2EmSUl9oxyQg5KYTJ05KFGRnDjzdUbv0whDzM4VqLnb1GSJWXRg8y1Yed/gczCEHWIydWCx9p/azQOglwuUqX4vbXORBizOK7UlK25Nd/g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:56:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:56:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:31 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [UWU8eHsN1+UHPiD47FUsnofVC+HFlW0L/rMmJwZqopA=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-66-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: 69d37510-3420-4cea-ed9b-08dc71fcd798 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 15V4bJh24NQpSsRNKl+M5eFdN3Hjty8aBqAD2px1EuJcD1NTR94AYYRJMquKkLFvKoVm74P0cwoK19BfE/a2dGjHJT5y4flKOtlzEJqNWpfu/WDRgMITGtJWcNCPuDk7JldKzDtNdOCPUcXb75A9Ym+ALHkR+OdgrHLwNjJ9zXP90ZaLtv7DS0sZZgrpCepjJQLsj0W31ur5P6IbZVej/02xZDzfHeO8TtGojJipaBm5ZFly6sk/sf02zH+yM0hkAmWCGy8J7KYjhjNfDaCxRTStGr5rZK+mv3APmEPp5X1Cc/eYj0zGYLQwlX5V2be+xtRG67tS6tDZL2Cje175bvvGsDyxscbmVmteuK2BvkJj197sCmspti3l22UeX0pyHJtM+stY5+alivLVpq/StC1zaR50zOA4IXWV006hR3fHMR1e2sy9eStiPjvhW4Nmi6wV807G0SJJvzJuBNu7eyv2R5dR6LzrHMmTFnHNqWb70VFtTYP2dPKPT7ZKUxkGEA87eOHT/JaiocaNF7HVkbmJXauFusl9EsU0prb5RwEN1T5waE9ah/meL+2YRtQpchjIJjL4n6ooHvnJ4/pVTO88ftrl4WZ/MxHi+ZCpr1f/db/PkBOZkUNXvFjelxtd X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XT3bPNLJMlPuzsR3dLtJIWawPJg5FQsEG98lMxBmSv61+O8aqYDmGehECpil?= =?us-ascii?Q?pFin96W0BnKtDe5hAQbUF+oApSAqcaCU8bbfrLAS2G5pOv1ExPAi8rOSyOUI?= =?us-ascii?Q?1Jr1VQHd2SvHX1DG2/Inr5QPkwZQOvZPBTEyuV2H59HnLeNNjJjiFDlxd25L?= =?us-ascii?Q?kQupeNNIf6OqdNXo3Ncu8GcXUipMWpHcySLLBjdfgS2rQlvmPdbUxuwQV2t8?= =?us-ascii?Q?EqNhG9/6fXx0y1EVFrd904ec4a2zEnA5qXroeiPMTxTZIqkZucrmSAC0avY9?= =?us-ascii?Q?6EmuFabHPGf1UStAzVFoLXaaZnbFlKbsnbXL5gC58nQJFDtkeiPfbYh319xH?= =?us-ascii?Q?xCv02MghLxO2eND28T0aArFCdNxDov7Pgs/xeXo7vEQv6J/aa8QCwO2Y61N7?= =?us-ascii?Q?kfAAoTfFEgbKR+uKEETJ5bKGTQ/Tg0FnAMEbvkrCwB2nBHgAsciwOPh1jGkI?= =?us-ascii?Q?OK0QGrY9m1UuAVA8ortvfIWPgolZoNLny717C6OTbdjf7tvxdQ/DBxVbjo52?= =?us-ascii?Q?lMJqrRd+WanLrnxD8fFX6kXFlpoDERCiv0dG8Sl/58K+PUOS8Kwk6f0Pe5Tj?= =?us-ascii?Q?WxpSp6LwN4gdlV0cUgZUbvs/LHk3SXGWjiq5tY67PcwOMAJNE1DTFO00rNNY?= =?us-ascii?Q?5KWPMkG/tJhnHpzrCsZD/yJbe6DWJK5sOIrJFVMOzC67NPriFjJ2oHpeIIXa?= =?us-ascii?Q?Kx2Z7kJPtWdg85XapW9INdfknukf94MUu2vcaSJGBwfmmJrhCcOmb3ghmiAU?= =?us-ascii?Q?i0OpL1GxqFv8WenfGD06mVLs58BhlCQHTKQ30fee/SoSc8dBU9Rl36uAnnA4?= =?us-ascii?Q?UCKF1F2/bDSj7MxAR8zukZaWHbdbvlL/b/eQCkoQE7kJrgp8kR+rs7c4DkxE?= =?us-ascii?Q?oC0H8oeYsKFd0WsD61LQPSDiJi1ZKMgqEt9lqM0tgsNAzEEGoBWNhe39xKHE?= =?us-ascii?Q?m1Q6TojpUCO+S08sZ/UwMGvY7+mFzYJEDxfnJv2kFeNuJQ2M1d3yvX4vbyF+?= =?us-ascii?Q?NN5kgNNhADsxe1Ubckj/KPg3nfelJp19W9jvbP5zMlE+pjovMfiZOzbnjfRj?= =?us-ascii?Q?Y/plvvGqULPlsHpEHsJdmZHodrU+OwC8xiMX79sPj9E7vax51OAmt8IWhB2D?= =?us-ascii?Q?8IAxb8lu5l8xyNX+ZWRpG7iorST1kTeu0bKQc2JvJ3RyAvsnI6gT4M3BH66y?= =?us-ascii?Q?s7JMPnIXQ/yB2Z3OgxZqv8nde/Ey/0Ji/KwMPxkqDsgpFg0qdQQ2LYKQWvZ9?= =?us-ascii?Q?sxfsM7vUWLNafvpVciFVidiot+wqBe9L7m5wGwHWzw=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 69d37510-3420-4cea-ed9b-08dc71fcd798 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:56:34.5126 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 67/71] 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 8a8ff2fbd9..c5ed4701d0 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 " @@ -682,7 +665,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 4339a145aa..5af74acf95 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -466,7 +466,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".