From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id A93E74E60E for ; Tue, 10 Jun 2025 18:59:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 76B8C68D3C9; Tue, 10 Jun 2025 21:59:16 +0300 (EEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 78D9F68D245 for ; Tue, 10 Jun 2025 21:59:05 +0300 (EEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-441ab63a415so60827055e9.3 for ; Tue, 10 Jun 2025 11:59:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1749581945; x=1750186745; darn=ffmpeg.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vP6zOOKIF3UpKlphoDSpnR/PW4gP10Hf47lotOLXPNY=; b=kxTF8QlXQD5f7yU7p++Ws20Uz0okUj9VATOxS2F4OKQQ/cvsQokLuO7xLeHxafY3m/ BEBMO6zH6ZijMiXZXiXxx1l9Gj0LhOkzzh64tdMB5ryniyfFHLuTK8IjhW+8wBZKrRgz IvkUZfBueBoubEf6hcTmqM/qh0Ee3og3GsfYc4PcbzXVtJKAO7Bu6H0Y4WqgTQBoNjn0 4TUfKcAzoR7UxQpMLS66BMSQoNMwq6ef9Ob13lOXovUvSzOgk9kJXxNvbiH+Jzkc4Umj J1ONfBySg01FFacqAi8TVVMXMOw6qM+bnXdoCVTuEpBbDCYYa3tcWNnddSSsH0wI+fKt P7zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1749581945; x=1750186745; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vP6zOOKIF3UpKlphoDSpnR/PW4gP10Hf47lotOLXPNY=; b=YesXsBCZvJY5+4AOOMxga0FvuVqnRz4T/lyJMERJyKVk1g+/PQVwpyYgnHWhVdKZ4d om2KC6ECUarBG9qX6qZaOkPSHWSQxkl/nctMYE3wg3WDmewsJk6/bKcOBP6u8psVs2iz eHAL2ODcF6vMBFbk/OVmn0mCMY4OT+a4/G3plV6aGMfetg2T4IQkA/R9xta3ubO6rKQg IFmT5smrPmQtdSeAGXdxtgHxHawP3Fw4VjdZblNCnDa2cWEsd/6yAc7Ezlwxz0ZqIdhr 1/+X/nRjF8kgxCfQow5QkMOvK8Z3d9/Mb+7l4qckdJHBxO7KiSWkjONCpNtbbhaOXbKJ dqTg== X-Gm-Message-State: AOJu0YxmQD/81v1FSxsWtqRzsjyEvjsdxPRsO7aXVnXLHHn8WXYb9XZY JC0wvNts75zrE2qRi/19k1SH5YVSydEDW5BKjVGbilsJP4/cObW/Mfh7KGycdg== X-Gm-Gg: ASbGncs+HBr4xQ9WQxyK9SSh5WOSMj3Dc3VbGOF1/KVuc/Potjzo34fEbw4MRNIQTZI w8SsQq/+ECbDC9qgygt4UmML2BSgY+8aXOLVG4EvDdzqi7ZclCxQfGm4Zd4wh7yC+A4xNZddm49 +1/oucd29qhYOk8NEtKCw3GrWs/oyA7JtKDP83t6oAyPKEZmN7o0is4TmVk9QJA7n8T8CkicymZ cqGVgIeBEQR2v8Efoz1UV5QmYghonrx58ywfZ+3i7bzh1s1XTQKQS1IobNI/syD1/7SpUd9NM4I 6i0UDakQnIfcRJvMFmow2sOAmTAQWEtfLdxr7zhPOtpNO3Gk/oXA0b6HbEEDkV6meDW/w1T5kef zELTexPuyL/Hb6XD6+dQrFNfz+DlIa/Kq X-Google-Smtp-Source: AGHT+IFrk87FNkftuyBb9NCY+C020mLnznjDzs/bef7FsfyInHMiuFa3q5l0dCbqOCkkKo6jjKXj5w== X-Received: by 2002:a05:600c:821b:b0:453:d3d:d9fd with SMTP id 5b1f17b1804b1-4532488343cmr2442355e9.12.1749581944700; Tue, 10 Jun 2025 11:59:04 -0700 (PDT) Received: from [127.0.0.1] (lfbn-rei-1-167-132.w86-225.abo.wanadoo.fr. [86.225.132.132]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a532464f20sm13046813f8f.98.2025.06.10.11.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Jun 2025 11:59:04 -0700 (PDT) From: averne Date: Tue, 10 Jun 2025 20:58:57 +0200 MIME-Version: 1.0 Message-Id: <20250610-vk-ffv1-leaks-v1-3-6bd045fc51e2@gmail.com> References: <20250610-vk-ffv1-leaks-v1-0-6bd045fc51e2@gmail.com> In-Reply-To: <20250610-vk-ffv1-leaks-v1-0-6bd045fc51e2@gmail.com> To: ffmpeg-devel@ffmpeg.org X-Mailer: b4 0.14.2 Subject: [FFmpeg-devel] [PATCH 3/3] vulkan/ffv1dec: fix FFVkSPIRVCompiler leak 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: averne 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: --- libavcodec/vulkan_ffv1.c | 58 +++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/libavcodec/vulkan_ffv1.c b/libavcodec/vulkan_ffv1.c index 8329b5d7dfad18de96884ea2c1f6f186682e430c..b02bc71683fd7d06dad3f4cf667ee3e8c57f3c83 100644 --- a/libavcodec/vulkan_ffv1.c +++ b/libavcodec/vulkan_ffv1.c @@ -1033,23 +1033,17 @@ static int vk_decode_ffv1_init(AVCodecContext *avctx) /* Intermediate frame pool for RCT */ for (int i = 0; i < 2; i++) { /* 16/32 bit */ - err = init_indirect(avctx, &ctx->s, &fv->intermediate_frames_ref[i], - i ? AV_PIX_FMT_GBRAP32 : AV_PIX_FMT_GBRAP16); - if (err < 0) - return err; + RET(init_indirect(avctx, &ctx->s, &fv->intermediate_frames_ref[i], + i ? AV_PIX_FMT_GBRAP32 : AV_PIX_FMT_GBRAP16)); } /* Setup shader */ - err = init_setup_shader(f, &ctx->s, &ctx->exec_pool, spv, &fv->setup); - if (err < 0) - return err; + RET(init_setup_shader(f, &ctx->s, &ctx->exec_pool, spv, &fv->setup)); /* Reset shaders */ for (int i = 0; i < 2; i++) { /* AC/Golomb */ - err = init_reset_shader(f, &ctx->s, &ctx->exec_pool, - spv, &fv->reset[i], !i ? AC_RANGE_CUSTOM_TAB : 0); - if (err < 0) - return err; + RET(init_reset_shader(f, &ctx->s, &ctx->exec_pool, + spv, &fv->reset[i], !i ? AC_RANGE_CUSTOM_TAB : 0)); } /* Decode shaders */ @@ -1059,39 +1053,31 @@ static int vk_decode_ffv1_init(AVCodecContext *avctx) AVHWFramesContext *dec_frames_ctx; dec_frames_ctx = k ? (AVHWFramesContext *)fv->intermediate_frames_ref[i]->data : (AVHWFramesContext *)avctx->hw_frames_ctx->data; - err = init_decode_shader(f, &ctx->s, &ctx->exec_pool, - spv, &fv->decode[i][j][k], - dec_frames_ctx, - (AVHWFramesContext *)avctx->hw_frames_ctx->data, - i, - !j ? AC_RANGE_CUSTOM_TAB : AC_GOLOMB_RICE, - k); - if (err < 0) - return err; + RET(init_decode_shader(f, &ctx->s, &ctx->exec_pool, + spv, &fv->decode[i][j][k], + dec_frames_ctx, + (AVHWFramesContext *)avctx->hw_frames_ctx->data, + i, + !j ? AC_RANGE_CUSTOM_TAB : AC_GOLOMB_RICE, + k)); } } } /* Range coder data */ - err = ff_ffv1_vk_init_state_transition_data(&ctx->s, - &fv->rangecoder_static_buf, - f); - if (err < 0) - return err; + RET(ff_ffv1_vk_init_state_transition_data(&ctx->s, + &fv->rangecoder_static_buf, + f)); /* Quantization table data */ - err = ff_ffv1_vk_init_quant_table_data(&ctx->s, - &fv->quant_buf, - f); - if (err < 0) - return err; + RET(ff_ffv1_vk_init_quant_table_data(&ctx->s, + &fv->quant_buf, + f)); /* CRC table buffer */ - err = ff_ffv1_vk_init_crc_table_data(&ctx->s, - &fv->crc_tab_buf, - f); - if (err < 0) - return err; + RET(ff_ffv1_vk_init_crc_table_data(&ctx->s, + &fv->crc_tab_buf, + f)); /* Update setup global descriptors */ RET(ff_vk_shader_update_desc_buffer(&ctx->s, &ctx->exec_pool.contexts[0], @@ -1124,6 +1110,8 @@ static int vk_decode_ffv1_init(AVCodecContext *avctx) } fail: + spv->uninit(&spv); + return err; } -- 2.49.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".