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 F11434862D for ; Sun, 11 Feb 2024 09:03:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEEEB68D0E0; Sun, 11 Feb 2024 11:03:06 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2016.outbound.protection.outlook.com [40.92.89.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C47E68CEAB for ; Sun, 11 Feb 2024 11:02:59 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GqYVARzCZHSbS7UNb+R3xv9dK2H8zwzYBELcsSnfhgs5asUjkJrWmfxYF0TTcmsOrlWFNjOs+97/eip7kecSs7pk/PVYn4n2MxJ0DZYiF+Z+6amzkJHb3R2OmxQpkS3uEuRQ10JiNqhbfRuUZclyCNtM7d5EkW6DaO8EwWVhCQYRhT0R0F4B8+ATcDQU5ig+BW2EhjAfslRSjITbqW0gP3vnP+EKBx3Ybf9FVWObglEgzTaqPBhdipksW9qpFaQcdffCzylpOc4djhUF6fpVbVkNrtX/30mG6DEw8kKNp/QKR0CCCHB11TgkSArfY3mLqimeC+U2ZCe/ltSAvLk0sg== 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=GC9FJi5Id8Yp91ShNvxLzyED2NtijKCin+wyPd66RBs=; b=i1RJAUotJdWpBZe5ALLq4VBUa8Yhdet4BGu/p6o6HLw93CToWSgdZf0a6/kaeRIR9wD3scNndRhiA+mkXLTI+KCCNG4Uvl6JHa7vBmV0+gHkoH2NbSTLKpPJZyWG9zQ/nN7kwGzm94iAFgiCTVdv6nsTwIMpmE+LHs+uOeFEpFdyGNpuDUJA4qbrgIyoqWgDp/LJvR3YMTQS1P6JAG/A12zgo+w+5q5rTAvHrC2+nZd/WJ7FsrAJVxii9lS3CJtvPGDRtxJNVFuYj+oWNCZ1LMMVhoimp2bHoEzf/VJwKZAyriJ8AwzOsZfIp/5TV/7rLkVQvXAR47XFlxTPuypsCw== 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=GC9FJi5Id8Yp91ShNvxLzyED2NtijKCin+wyPd66RBs=; b=LjLkgUr5l1RU2r+RYm2f1ORhmBVAMyEaly/FfsfqHrPUiB6YsP1BtBbq0XSSp9fKtTcvMZW+YqIXQvCQIwNcp+mO1H0e2YOlqPkIa9ASyn0oj4lyeDsTp1Lbv9VulndejYX5fxtsOzRvxy6oMicMT8UPLWoLGe6VZt0NFSctTv7mAUgiAyEWiEugaNxO5BBZ46W3YXrs7bEWFFEdebgMhlsi6Q25L2LcpPeqUCj9lqbRDFwE+8V6sRgKxIUSqvNlzYleBvsUwvChfUhfAmb9PXRHmLtq1JlwlnZI6x68tk3GWPC3tHwVpJCn7TY3wPt6QcHeFTjh3ypJGfucg7uqJw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0021.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7270.37; Sun, 11 Feb 2024 09:02:35 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7270.033; Sun, 11 Feb 2024 09:02:32 +0000 Message-ID: Date: Sun, 11 Feb 2024 10:04:27 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240210225847.53228-1-connorbworley@gmail.com> <20240210225847.53228-3-connorbworley@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20240210225847.53228-3-connorbworley@gmail.com> X-TMN: [IUuU7FsHXVckU3BTkrHo2nBccFtItSAF/RRo3y0ryYs=] X-ClientProxiedBy: ZR2P278CA0011.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::16) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <54fe3cd5-5199-4836-93c9-cc2930f60551@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0021:EE_ X-MS-Office365-Filtering-Correlation-Id: 928b22e2-3d9e-4d10-e0ab-08dc2ae02ee6 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqwZHg0HfSFdg5yZGCZdmRtvv/QsARhM52E/vkJ1QcVmJEXxcOe+5DqURQtufHvj+FvdGO4usDkbJtA3W1pvrT8hEvqoz5ZUSTQXt9I71yTGzP8HWoHPLW7dnIaaWklpKW9O5lJHDgyhvQl48hq/O44IXfNvM5t7Yf+DfAolNkFnKG63g+bAreHGTJGBsKbjijzO+eZTnbcN2oXkO8I2jL/YuU2NKawJrkQS4/aZ2ZC8jYt/XbjfNwsPp5SZNMKjZeDgHJm22/SAlWGgV1abrX3USnFUFDghPwQBb0Qxn0iMaYnKRv+3U1pwSiOltP/u/tO7MkbvnIuFQQy2ff3XY59HVHrgPdYlM/NCJgYo6Ky+48Zx0TLI/yeCH6ojR3hRaGHe1b2y9A5UCU4poKnPeGK4goQVN25uASwZdm6SANUucqhXMJ7FnLFUAp0PObcDxpxsYDazWLn//3CSVFh4L2d0nCts1P2u2yIOMI65keMawJHRhIA9j//SX17m4Y9rzcfmDqLwZ+URox8BpCv0zwLSdZArZ9H9QgDlKqqN2AjIzDXJ7tPrel4hEtO68Kzw6V/45+j5is2I4Idsh7K6FYKTaWI0b453X6YJ6E/EN9Ic1HW2AzG/S7atk5iASoDBGN6tLp94XuQrF8HFcOYhaM2K5J2ISX4WYepty0G/Cowm0bLVdeSUUthC5/GJ/q78iZdJdfCMYzaMAWgdOQAlghHXPKeVSHsxLGMw2oAnhvZN5PykXvxHUCCGuU2wFhE3ks= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zHOBnilOJZr7Y7RB7XdLOW6QUhu/Gb2fRUwpZe23CBu9omZc8/nDjTjPyH8P77Ejlw7HjlunEk5uyU6Xhlb2po4lSDyi3GkJZ72qx1Ce3LOBr1N9GAjKczYNiyiRbgC2u8K+G8Xr4T48U1GIIH7/jzxDWhAG+mswxDxu+0Bb0QUtPmoVwohYZjkoY8j5PtGVIptwe2Jot4qmCS4FkVb0hyaqhabYmGOQ8GM66lEtviPDLrCDBS6gt8VKlJWfZ13xTtptcYG6O7WhESwIell/zaHvCX+i8CZOKMDD3umBmkZXspxdIRYRcw6sXJPKkmWPGZqInE/HQ3ObZvbefxWyULe4TS6E8r9GPRbXLqyyiIvlEE0ot8kNBSd1A2f4tgFLFYrIeW96co9BAXCTKyREWUtoBiNpOSDTzQ9FXh91WQfIlrLc1Wx0aNebTV7wxqyJ+MXcU/OrTLfVgnZvzNno9E8P1Y+9e8wFfi7HLLBfsNQsB6+j7T+h3nc5NGU1E3kH7okLweMq+G/ZCHnaIkSnd2IWyKLpZpMy/fYxTaBIxqFkstDJJIMUZgaOgBkKENlw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Tk1uMDRRcDEzbEdaT0lPbUJzTExVTStGTUEwZjlHNTU5MVJMeUhRMVhxT1JN?= =?utf-8?B?N29kRWFqcUN3cDloRnR5eVhtL1BnVU9QN0NlTmxjTjBOaUF4ckY2WFcwTUd4?= =?utf-8?B?cktjaGdGU3B6T2dCSndaaDRLN2RMNTJYZHMyQzUzeVZDL2ZJeEdTdWFMM0J1?= =?utf-8?B?MU05RVlOS2l2RjYwc0pOTFkvOVJSM2JMZ3JMaTNDc0VDK0hXYU5HMURtY0kz?= =?utf-8?B?dUJGT3k4NTZnODhLQ01vNzA2WUNJQVQ0eGs0WnRjd2p4Y2svRGprZ1RmdUQz?= =?utf-8?B?U0xmNkcvNk5WYWRYQWRrRmV5STg5L25UNGd3OEpPU2YvQmlPY2xPb2dwVkpy?= =?utf-8?B?MnhqKzdZUDIveXBCWGtFVFYvMjJVR2ZNRG1aZHZEdTEzM3dtMmNkTDE5OVRT?= =?utf-8?B?T2xDNjNrbnZFczA3MjJHVS9ES0hVMktJTUg4R2VhSzJuaTB4bmE1bWkvZVBs?= =?utf-8?B?QlJDbFNndm56a29GM2hLSi9yK251dmJEanJqV00xWDEzUVMyeWxFUlFBZVZZ?= =?utf-8?B?MUpMSGhWTUQvelJ5eEMwN1AzelZoamFacDNFSVRXSWtUWVc4V0FMMFF6dll3?= =?utf-8?B?NzBDUUVibWVhd1R0WWhFRnJUS2NoU1JiWmIxZXg3WHFxTlFQTzExcDR6U0F5?= =?utf-8?B?SkVTZkVtQ2dRdk1sRXBZQU8rajhselVpeVRuRGZrOVhkQTUzRUNjTUorUXU1?= =?utf-8?B?M0F3dExVQm5Xc2F3bnFLUm5MNTJDUzJNUnF6VzF4TXVUU3ZPazlwbkVmcmdW?= =?utf-8?B?ZVZZVVdhMXhBaDRaamVSSVcwMG5mNnVFb3RDTGhmQTZhNzM5MDgyZnFTK3JR?= =?utf-8?B?RHNmTjNSWHpmRWtTb3BHd1dVc2RGVlBZZHlsMTJRbjlYR09LaHlGVC9RVHRx?= =?utf-8?B?d0MvL2ZGYUkrY0E5elBFZFBycUQ2SDdwUnZVcFRVUlZTY3ByckdPNytMTzZM?= =?utf-8?B?QUVPZ25mNGs3SUFvUUlMZnBOQnNvZ2tLR2t0cjFiNUZyM0J2azBKYWhGUnA0?= =?utf-8?B?WUF4b3NXRHNIUDZibGJkWlIzUkY1QytFekdHdkU1eEFtUnB3UTFnYW9lZTM2?= =?utf-8?B?eEp2U0pPb1U1TFdvK1VwMzF4dWdUaVNodVdqd05VQ3RmSktHUXlPMm1PYWxZ?= =?utf-8?B?VTNSTkNsZmxwWGd2dkJubWpKSW1TbHhjUTB3citkWjJtR0E4dmVNMVZnQ0Nr?= =?utf-8?B?MENlLytTRDhBc3lJL0lqWE41cGhtMG1rTnh2UEoyL2w4ZTNaYVUxbThtSktJ?= =?utf-8?B?a3l6Q3B2T1lGRTVUZGM5cWs0K2lkcTllSTlxNjlOVG5jM0NabjEydGZSNFF1?= =?utf-8?B?YXcxd3U0VUhpSHY0bGkreENUK1hVU1ZpYU01c2UxQjcyUEd0QVF1a3JyZ3B6?= =?utf-8?B?MjBLdG9WTHJNSVhzaGlNdXlwK2JCc2VyWnllYXFVMkFpdDI1alNGeW5pOFhD?= =?utf-8?B?MzhZWVZORHd2UEtXdjVrZ2NkZDlMdlRCb2g0ZDdLYm12a1VmVm9ZMnNvVjJr?= =?utf-8?B?WU1ma0dJTnhGcng0eDd5STl2ZUIzMFZaM1FvOTJxVTVNSFFhajBtcXIrdE5p?= =?utf-8?B?WUlGRGE3UFR2SVBpbWFZZGlMOEo0ZUJsbzh0WWFENFR3VWtQWGFtU1IvTDJW?= =?utf-8?B?aXhTQjVlS0FPTlBsVnAyQ2hVbzY2b0xoMVd6eXArR0dFQ24yVkJJL0xDczJi?= =?utf-8?B?M3NxMHRlM1hXSzY4Y2lDd3U5bWpRVGpubDhJWHBzS3BhRnlDTFJsMXJBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 928b22e2-3d9e-4d10-e0ab-08dc2ae02ee6 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2024 09:02:32.9154 (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: PR3P250MB0021 Subject: Re: [FFmpeg-devel] [PATCH v2 3/3] lavc/dxv: remove ctx fields that can be derived from texdsp ctxs 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 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: Connor Worley: > Signed-off-by: Connor Worley > --- > libavcodec/dxv.c | 53 ++++++++---------------------------------------- > 1 file changed, 9 insertions(+), 44 deletions(-) > > diff --git a/libavcodec/dxv.c b/libavcodec/dxv.c > index cd78de3e0d..82c493f1de 100644 > --- a/libavcodec/dxv.c > +++ b/libavcodec/dxv.c > @@ -39,20 +39,12 @@ typedef struct DXVContext { > > uint8_t *tex_data; // Compressed texture > uint8_t *ctex_data; // Compressed chroma texture > - int tex_rat; // Compression ratio > - int tex_step; // Distance between blocks > - int ctex_step; // Distance between blocks > + > int64_t tex_size; // Texture size > int64_t ctex_size; // Chroma texture size > > uint8_t *op_data[4]; // Opcodes > int64_t op_size[4]; // Opcodes size > - > - int texture_block_w; > - int texture_block_h; > - > - int ctexture_block_w; > - int ctexture_block_h; > } DXVContext; > > /* This scheme addresses already decoded elements depending on 2-bit status: > @@ -865,9 +857,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > cavctx.coded_height = avctx->coded_height / 2; > cavctx.coded_width = avctx->coded_width / 2; > > - ctx->texture_block_h = 4; > - ctx->texture_block_w = 4; > - > avctx->pix_fmt = AV_PIX_FMT_RGBA; > avctx->colorspace = AVCOL_SPC_RGB; > > @@ -878,8 +867,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > texdsp_ctx.tex_funct = ctx->texdsp.dxt1_block; > texdsp_ctx.tex_ratio = 8; > texdsp_ctx.raw_ratio = 16; > - ctx->tex_rat = 8; > - ctx->tex_step = 8; > msgcomp = "DXTR1"; > msgtext = "DXT1"; > break; > @@ -889,8 +876,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > texdsp_ctx.tex_funct = ctx->texdsp.dxt4_block; > texdsp_ctx.tex_ratio = 16; > texdsp_ctx.raw_ratio = 16; > - ctx->tex_rat = 4; > - ctx->tex_step = 16; > msgcomp = "DXTR5"; > msgtext = "DXT5"; > break; > @@ -902,16 +887,8 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > ctexdsp_ctx.tex_funct = ctx->texdsp.rgtc1u_gray_block; > ctexdsp_ctx.tex_ratio = 16; > ctexdsp_ctx.raw_ratio = 4; > - ctx->tex_rat = 8; > - ctx->tex_step = 32; > - ctx->ctex_step = 16; > msgcomp = "YOCOCG6"; > msgtext = "YCG6"; > - ctx->ctex_size = avctx->coded_width * avctx->coded_height / 4; > - ctx->texture_block_h = 4; > - ctx->texture_block_w = 16; > - ctx->ctexture_block_h = 4; > - ctx->ctexture_block_w = 4; > avctx->pix_fmt = AV_PIX_FMT_YUV420P; > avctx->colorspace = AVCOL_SPC_YCOCG; > break; > @@ -923,16 +900,8 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > ctexdsp_ctx.tex_funct = ctx->texdsp.rgtc1u_gray_block; > ctexdsp_ctx.tex_ratio = 16; > ctexdsp_ctx.raw_ratio = 4; > - ctx->tex_rat = 4; > - ctx->tex_step = 64; > - ctx->ctex_step = 16; > msgcomp = "YAOCOCG10"; > msgtext = "YG10"; > - ctx->ctex_size = avctx->coded_width * avctx->coded_height / 4; > - ctx->texture_block_h = 4; > - ctx->texture_block_w = 16; > - ctx->ctexture_block_h = 4; > - ctx->ctexture_block_w = 4; > avctx->pix_fmt = AV_PIX_FMT_YUVA420P; > avctx->colorspace = AVCOL_SPC_YCOCG; > break; > @@ -957,7 +926,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > texdsp_ctx.tex_funct = ctx->texdsp.dxt5_block; > texdsp_ctx.tex_ratio = 16; > texdsp_ctx.raw_ratio = 16; > - ctx->tex_step = 16; > } else if (old_type & 0x20 || version_major == 1) { > tag = DXV_FMT_DXT1; > msgtext = "DXT1"; > @@ -965,12 +933,10 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > texdsp_ctx.tex_funct = ctx->texdsp.dxt1_block; > texdsp_ctx.tex_ratio = 8; > texdsp_ctx.raw_ratio = 16; > - ctx->tex_step = 8; > } else { > av_log(avctx, AV_LOG_ERROR, "Unsupported header (0x%08"PRIX32")\n.", tag); > return AVERROR_INVALIDDATA; > } > - ctx->tex_rat = 1; > break; > } > > @@ -986,7 +952,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > /* Encoder copies texture data when compression is not advantageous. */ > if (bytestream2_get_byte(gbc)) { > msgcomp = "RAW"; > - ctx->tex_rat = 1; > decompress_tex = dxv_decompress_raw; > } > > @@ -1004,14 +969,20 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > return AVERROR_INVALIDDATA; > } > > - ctx->tex_size = avctx->coded_width * avctx->coded_height * 4 / ctx->tex_rat; > + ctx->tex_size = avctx->coded_width / (texdsp_ctx.raw_ratio / (avctx->pix_fmt == AV_PIX_FMT_RGBA ? 4 : 1)) * > + avctx->coded_height / TEXTURE_BLOCK_H * > + texdsp_ctx.tex_ratio; > ret = av_reallocp(&ctx->tex_data, ctx->tex_size + AV_INPUT_BUFFER_PADDING_SIZE); > if (ret < 0) > return ret; > > - if (ctx->ctex_size) { > + if (avctx->pix_fmt != AV_PIX_FMT_RGBA) { > int i; > > + ctx->ctex_size = cavctx.coded_width / ctexdsp_ctx.raw_ratio * > + cavctx.coded_height / TEXTURE_BLOCK_H * > + ctexdsp_ctx.tex_ratio; > + > ctx->op_size[0] = avctx->coded_width * avctx->coded_height / 16; > ctx->op_size[1] = avctx->coded_width * avctx->coded_height / 32; > ctx->op_size[2] = avctx->coded_width * avctx->coded_height / 32; > @@ -1031,12 +1002,6 @@ static int dxv_decode(AVCodecContext *avctx, AVFrame *frame, > ret = decompress_tex(avctx); > if (ret < 0) > return ret; > - { > - int w_block = avctx->coded_width / ctx->texture_block_w; > - int h_block = avctx->coded_height / ctx->texture_block_h; > - if (w_block * h_block * ctx->tex_step > ctx->tex_size * 8LL) > - return AVERROR_INVALIDDATA; > - } You removed this check without replacement. It presumably fixed a bug. Did you test whether you reopened said bug? (I think I already asked this in an earlier iteration of this patchset.) - Andreas _______________________________________________ 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".