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 DBC2948E25 for ; Mon, 29 Jan 2024 07:52:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 243FC68D18E; Mon, 29 Jan 2024 09:52:36 +0200 (EET) Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03olkn2075.outbound.protection.outlook.com [40.92.59.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89EBB68CAC6 for ; Mon, 29 Jan 2024 09:52:28 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=byB/kc+vS4rPbGeMl13It9uxRiF31gM1o1dq1PJZRVOrU7KjvFrBii+Z4C1ERCD7KPKDF7oWtfpy5kmL7lT/14j0Og7aE3+LrG+ecV8UL865A5G4BOfmrIR/mth2R8SXA/xECaw2HK9seyjkP5Am0bVu5Ti2KgQBWDmm8bFMPbK4LZude9J+ol9N8Y3dtIk1nBqa2T9s/nnR36b8Ou8o6IpUiA69WlywXK36/cWQOenzjxfj/ZwOj3kbtKZdMK87psth5C7UoNyO/cZ8SOwogwXH6QIiZxS3D6l+hFuhD0bdCSAsIUHks4s97p6EQ92n2CEUl9v/ZHNCYXObi2PUew== 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=XEvoSshE4WazBsRqBPUOEBFQ0o4E300TsMnb3ikIuk4=; b=QR9qzmCmmrMZTfAVnHkOgpDzUARCVqWba5mmKEyuCDFzHF/lEC8B1/bXsg7ROPgUSQASDTiUR2zA0CjH+CctaAtrPh9/CprFYoDEWShUDX0SfC3LOrTEe/Qe9vIdEdxn9FksY2shomKnBnM+phbrdjDTPNzCiQ3Q23rfOLciMYXohzM/kh/72276fgfgqzzDvTj0TXuLqomj0RoXmuNcJNIbY/NAOgx4jTLvzDUy4avASbORhdVAopIqSNyKfTvlDAmnmXE193fLEfS7Xsb56eDihpvAgWg00jl9Q8wkmSrRh4efKrM1bUfrHS7KqFwfJOqFUaE9e15SIAXlW1+XPQ== 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=XEvoSshE4WazBsRqBPUOEBFQ0o4E300TsMnb3ikIuk4=; b=jMmHH3wQho5D1Dk3aj0rGBzjlM1HkKWPCKryy4H1MzvVNq7hAyDEb056omN6uY1aIzyxoaAPaHmvU8TDTgN/I5e6LLFdVnlK7SPuykctUhgPc4IeX/rqJHYi7fPTqECqx/vBF0a+hApy8GSzfv4AItpE9yvdeNMAxGz0GBeYxtaAiWLJdN2JC1+zR7Cy5dyTswOEe3WTQ01uaIUmU7c3A7h1BmWscikDFA/upPXZXXnhCnYbjoIedcgK70/kbov5V0lM7136nS2dIyvdbUPRAWaLd9U5UCLJdMTjuhy1BCKO6wKtDV/VwDZWVRLYDyo7wsrz1r62t3covbnheTeh0g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0009.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3d8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7228.33; Mon, 29 Jan 2024 07:52:26 +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.7202.031; Mon, 29 Jan 2024 07:52:26 +0000 Message-ID: Date: Mon, 29 Jan 2024 08:54:06 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240128211335.58631-1-connorbworley@gmail.com> <20240128211335.58631-3-connorbworley@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20240128211335.58631-3-connorbworley@gmail.com> X-TMN: [gSc/pWrZAzASmKhyiWx4RtoxHi8wq4GhEoVYgqbz2Ew=] X-ClientProxiedBy: ZR2P278CA0032.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0009:EE_ X-MS-Office365-Filtering-Correlation-Id: c52b5f5d-3b98-4ffa-1eaf-08dc209f3c69 X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnoDeMQYelObf/NOc8dndilFpxFkzLlqVG2XXnaeuzSkO73xkmJXVvYjG7yDxjDAF1dv4ZcJW8pww6N+4Uk1xlMQxdsftK2yX/yNyIwG/GqZjwaeqOWqQJvnDPHiCyPByi7HNaKbE0tjU4+jSi3h+nonL5FJl0lp9oX4Yaq4du87mkICnZ6v9asupr77m3IH1et+NqIAMW2Hv9891wwF8kQ8WOmxLpRTQ+O6hoTMEfnD5DgHmGBq2c2ryzr3G2Uhr1hujBnLzvrtUsI5Qf3FogR131i6AfXta9Azw/XTxBcjhzVZO5nSLwD6r05CgL7VOoPYqgohEMz2/Cf3Uk1ttCRx3hwdSKETFrQ1ouoDzt395cWmraPlXHS49ylRrr6UqARPwQ4o/84v/Qbkr8nLi5q0WLKioNVw6bRfePAgChsFu1l55SNxC5978znWkI1y6oqQQxJCu77FJahSc/Y7SnPoFemMDL0i5hty4JIkxYOGgRKLVcGRS6JxMySb/nCYlE4JzH//HSWKR0obBicg9m9rRGYK5jYV0wgKY82RY66fCF1+7a61qRBLs+oTdcThadiBFfvuMvzDCVcy+O67plwKFSM0RBzJV+/WSBWPE3M3/Qt9/RTxcPCWbkdzIr3M0V3RVb3fe0bWLCJSep535jh9YvF+8a0kmldtbtNGGRIKDuuQXq/Ph+XbxV4fFragkZ6/b1WANaRPN2qNBarqwm/QJz2d+vKP/wroicH/NcMnBSlgnzB/eDOwHXWZhntw95s= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0R0oWGSiy33mIdLhTk0GI35V0E/inepmF8w6BKlre2xYQ8WvVaVPWDEenRMq1Nnw3Ijoho100hTTygJrh3yAsOOGniwtqwuI47R8Fj1PJqweaHxQop7boO8RYMe67wa8mykMNeUOSmLmjGVBTuyjEmZADAuVktdn66q77TL2dndNnjj02cBGLVQW4DFIQSX94+DYJ2SAMpkBBlaC75HYnpMRr5Wxpk3ysPSc6hz5NX+aFToDOu3/x8HHX3Js3EtrkHqq0YvFDebSWxaa/wBIbgz47IQ2+OxelPcKy95mK8VHGrZILvBaVaPnN1QjF7Gi2hhcqLzyhewWwfniwUqavVOl8x8X20+Q2e9TaLDXZPzsvuMUnL3iKHLIJullzdimlaXJs02G9pR0zCRYmY7+RWtfFgXdgWggxPdxbgY8HpBSIbNQpz4f/QppNVJgY9gm0rfJ9a+9DUJZQa7xKG0aBKYBxnfjn186hu7m1iH2aws8EirS1QA4LCLuGg6CPbbvOLqgX7+VG21/hsdR28DttV3Y1i3ssmSyBaeYHtiv1gWCrmyK2lvuTVbfdDzUfkro X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?OGNGVGt4V3ozU0JDV3JDbmI3czVVcjdYTHM0OFI5RTQ5bjBnb2ZubENaMEZj?= =?utf-8?B?Z1JDTXo2anU1elIxUTNjUU1rVFV6RE1UeGlCY1ZiTjN1Y0U4LzZ3c3VsMzUy?= =?utf-8?B?dW5SWVdhNzNjWjlFbHhTVlFYQVhpbEYyN0wwaFVPeHdJa1dBaGZkREh2aHUv?= =?utf-8?B?N0ZTY0JCNEk2YXJySUtyYlZ4aXA0eHNFdVplSGl6TUpZUGxDOUYyNGp2c3l5?= =?utf-8?B?N1J1L0szMHpOWnlBbzQ5YjJwM1VBZlFUN1Y4YnF0NStUT0dKZTJTNEhUOXpL?= =?utf-8?B?aDJibDBpVVFFdExaV0FBdkdzZXpOODRBbmlZazlLRWYwSCsyRi92bkJCM1lR?= =?utf-8?B?bytHRkZsSlUyNHo3SUlZZUlRLzczRklwMWk4SGVubVNVd0ZsWUZETlVOUUxH?= =?utf-8?B?R2lBMEZZR3dlZ3J0R0pEVXFLSXFSSDMwTW1YMnNZTFVSajdwaTNoQjFZeGZi?= =?utf-8?B?TitoRUI4UFRhTEMwckdvZ05TWDdmS3ZSOW9mekc2Vk9KQ1lWQmJnZTV6SE91?= =?utf-8?B?eUpzTnhGdEJDaVRoRXAzV09qaUlPQnkyTWlleWJjQ3JNdUJIR252N3ZyaCt6?= =?utf-8?B?QmpqS053OTFLUHFiSjZwODRFNjB3dDVwRGtIbmpnK2wrelJpOWxrcmdlYW1Y?= =?utf-8?B?cExyZDV1aTdVVFI0UFFvTGhVYkMzbW1Xd0x2VWdUUU1EalRJNnhvaHdTNTdK?= =?utf-8?B?b2dOK1IybkxXK3dtUWxBdEwveG1DK1lvNjRmUjBEeDFIWDFQQ3MzYm1ybVlS?= =?utf-8?B?NmErcEdKM2dyTHdDUzRLR1ZyR1pidGZyWERYVkhrZXZRTEovVnFOSHBNa0to?= =?utf-8?B?Szc1OFFSdG1hSTdQVGtpNGxaTzV0bFpaTFFRQnNYcTY0QVdIeHpSMGdadzRD?= =?utf-8?B?R3FHeU5BM0doakhPRHJVckJqbW1lNGNMbDlkZzZvaVVBcEVKK25VYlRUVEkx?= =?utf-8?B?NU84LzUrYVd3VkR0WVhkUEdTUjFJYTZSaGhuaUUzQ2NCZmhFdUhla2Npajh3?= =?utf-8?B?a1dvTWZlTGZCeTkzeS9aMDZJbER0Z3g5M1ZGdXNKRnJPVHR4dW5panF5dVl6?= =?utf-8?B?R0VVNGhtSm45SWhHUnpPTVA1MElaUWFQaCtOMGM0cE94Qm4vbU54NmN3VVlr?= =?utf-8?B?RWV4b2JWazZnaGorcm4ycmNXemtqUGF0QmRXbzRSQVZQK2hwTVIzZHdFU3Iw?= =?utf-8?B?QkF2SFZlYXZ5S3RiUGRYaENmQVREY0ptZE80NDN1TVJHYUN2Z0xKVTZWL1hH?= =?utf-8?B?MmFWUHF0ZmdwYWxkV3NpdjZUcXhyM1JZSDlpNncxWnNWYWI1amdIUTNGTUN0?= =?utf-8?B?Nkw4SlRyTlp0b2IvNkNWdGFPR3hxaVZmVFkyMlN0QzlpS1NuUm5kZjFMZlUy?= =?utf-8?B?alhnWDhFbDN0b0NaSnNvNTBkU0kyamwvUER4bmRBTmxxOG53TUtoMTFBcTRL?= =?utf-8?B?bWR3NFF4RkcrN09VTDZaa2FYYk4ydVZmZG80L2xMNmlOMGk3NFJwUm5Td1pP?= =?utf-8?B?YWVydS9lNUF4aW04SXJRbG9sMEFDeGhQQXc2OFJDc3FZZy9hb2IyQzROTFNB?= =?utf-8?B?b0hQbC9JWGlHaTVleDk5bHJjRUhYZWJSN1RXVk03Skh3cmYvV2Rlb2JxSnA4?= =?utf-8?B?N1l0V2Y5d0orSlFoTDRtcFpXc2daZ0kvZzNFdGtPRnlxN1ZETURRbmdIM3JO?= =?utf-8?Q?xD4loGFv8lf3BkKZ071p?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c52b5f5d-3b98-4ffa-1eaf-08dc209f3c69 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jan 2024 07:52:26.7363 (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: AM8P250MB0009 Subject: Re: [FFmpeg-devel] [PATCH 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 cae5d8a92f..b29adf8ad9 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; > @@ -888,8 +875,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_rat = 4; > - ctx->tex_step = 16; > msgcomp = "DXTR5"; > msgtext = "DXT5"; > break; > @@ -901,16 +886,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; > @@ -922,16 +899,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; > @@ -956,7 +925,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"; > @@ -964,12 +932,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; > } > > @@ -985,7 +951,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; > } > > @@ -1003,14 +968,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; > @@ -1030,12 +1001,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; > - } I am pretty sure that this check has been added due to a fuzzing sample with gigantic dimensions. Where is the check for this now? > > ret = ff_thread_get_buffer(avctx, frame, 0); > if (ret < 0) _______________________________________________ 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".