From patchwork Sun Jul 7 10:39:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5235120vqv; Sun, 7 Jul 2024 03:49:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUGOq/G4+VAaq3K4s5ESWNX0JMa2eVYKvAvbXmCPDV933TU4LcujXexB2M+Zrel38AHcBnKw/VfZ6CPbfUSqTVeuBMZ3LMrvPlQVQ== X-Google-Smtp-Source: AGHT+IE4CwjuybvHMjV3QryZ96LDPdaUu4I/i2TJEC4fWLSJegULdUB/QJr9MBBgMHASbRLqimAy X-Received: by 2002:a05:6402:2695:b0:57d:61a:7f20 with SMTP id 4fb4d7f45d1cf-58e5a8e6a60mr7629005a12.3.1720349347509; Sun, 07 Jul 2024 03:49:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720349347; cv=none; d=google.com; s=arc-20160816; b=fefzX9N22lUX85DqxUZ52lIcoKlFG6yoWgmazkSB5MIYW6eACAT9dktMPkgZI3AmnN LF/f74z8Z/5cpdtUPpI2+EOtietb8W0sOPZMN4FLlJjlhvQGx3C8AOsiAc4KY7pMfvya Ujh/SOUKE/Yk3d05cdnJgxOkq/TJfRzfX4QXST5otFoypgJgkNSZqtNczjsbNjtDmTQn LZVl8m7K8gM306fY0a2PjkySoiivucHHw7DQd/FXbb2GxfMiO2SDTGM01wg8Tw+jQEdS 4F3PREy92Dgoctr3LUcQTKWyjg9hK1l2iSkeOuKpl5U1RetMcgbnbw29MiYQOsWt8C5k 91uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=2ZH8QwaHswFMdr0h4E8c/eOSR0paUnV7HreP22V2vbk=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=N8oMAkwN886JBBJ4SguLvS6P6kh5CRPnr5UCI7T0usQjqvw1JkRVHAiXbxNMGjBzlJ P2lFm0y0f9iHoyE65PNxf6Kx1qpwrLrovAjDo0UYrTFA8BhY+S82oDLgu37PTGom3Fjs 5/4p9BRLuUwvJNwZ+1qnhW/wWycqW4EwkFfoO9lJgQ8xzu1keIQXQH1Gd16WfV1AJn4f XexhrXNgsf/epowRoX7B0e004wVNnmC6BJIOT9NfQrFtYgq2mL06zL9kswiKWRGEBMTD Wk+atkfeim068mp8IdNIcvQxdI1JQlPrlVGvF0cXrxhOf8jsBeZ5wcXDeqkKUFa4tND7 i9AA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=v7sey9ku; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-58b70ecd698si5999999a12.325.2024.07.07.03.49.07; Sun, 07 Jul 2024 03:49:07 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=v7sey9ku; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D5B3D68D926; Sun, 7 Jul 2024 13:39:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-191.mail.qq.com (out203-205-221-191.mail.qq.com [203.205.221.191]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3850668DA53 for ; Sun, 7 Jul 2024 13:39:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1720348777; bh=Rm1cI+FJUzvTuLg5JnonK5S5tLUiSkFgknV3S6534Wg=; h=From:To:Cc:Subject:Date; b=v7sey9kuLbc2AsYW78ayJIsFGza4ZEJUzztklYtUQjenL7Wv8Zc7RNND9VcJenlhb waUrbr1cV8djn0ja2o50BKe0lZyYMY24TIH7aawzuQplM7phsH0OBA8oiOe4dJj4zc H/NZkDxoGiGA4cP4z7WY64nYjyhVyy74ke+a1YU8= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.28.29]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 9E4B5AE6; Sun, 07 Jul 2024 18:39:36 +0800 X-QQ-mid: xmsmtpt1720348776tz1byr4fm Message-ID: X-QQ-XMAILINFO: MyirvGjpKb1jT8r64tu78Gfh0Lvf2AXxCZ5i1Mnb2zRPRok/8W7vgZwLZU3zLu jkQqZj0aVQtCUDO6AV43ZW8ZIEDY1t9J2LLmbDZfyL2QsBjLsnqK5eVnNdvA7fuv1AaMJNi66yjo t336Y+UbgbKA+DpAIC2FDIQe3Ra5ia9MpEnbtTQw9NwJ7+R3FZ2ySK9fwOQzZrfMMcBZ1DLEbOMz 4FQid/wu2dOo9YfzIJELAQj10AtT3f4TMnmCbv9B4n1Bx+12G12AqPwuInt0tLavV42XsZQaPYw3 g/4ddEX83nMGkEI7+qo4DN2Gp04jlrotE4UIZqGVRi5TtLzFhedWsyYfW2MN+Nyr8g6rkodycTs9 z2a3KaYfQLK7Hni3sdM61J90IaJ+iQ+DMbgWXIZ+mFfXI8ohSEIjMS8OiWxyiM/rjGsN58Mv9LVl fndEs/iMguYiz88yOgV8U2Dmwc8YlQysurskyFVpZ/EXdvJebc1ZAv2qiodfGeEnMYlsF2zQ5h// bGn78KhPmDER5AaQ0uxR6TnZ0Ns92THqXqLMlpTNyJ0QKfDVVULsO79h/9xhzuOhfw/xDvaZ8rNq 1OK8icnw47LpoYH9HDVPI97p+QFdmxvUxpzyZJ9t5w1QGeTuXka+QgQSFDzOTyxsqGkmtTU2GKUZ biNSwShU7gk6+YbeGgTKeEG8scSpxlwywQURHBLcTmbhmUjgp1O+FQNcI0c8ZOivo61g1z0h6KjQ 21ooGsz7242Q3Nf7rqmJMhJaxgoSJmmD2O6IjWxyc2+9Z4LktZHPwuHtm/oxxmqDiBTWn9FMX8ex tcyuRMBWOhwveZr70Caj2wNTusg/n6yFJ5Fp1UCZXr1MtfcinEpqRhyUa0DuMioCaNcVYhaBusDU 1P3thKJZYa+WYbHEmnr1TSulTqe3KkBqHVSbo48/Y8Zifl7am3T1kh/zbhW5rpgaR+ye/il/Tiin GqY7DPjBZGmsPsDFP4qyjii1wfZux/3jSbywPe5Hg8oYakTdeGdw== X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jul 2024 18:39:35 +0800 X-OQ-MSGID: <20240707103935.99682-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/5] avcodec/videotoolboxenc: Use BufNode as sourceFrameRefcon 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ybwy0HYPFaSH From: Zhao Zhili ExtraSEI is used as the sourceFrameRefcon of VTCompressionSessionEncodeFrame. It cannot hold other information which is necessary to fix another issue in the following patch. This patch also fixed leak of ExtraSEI on the error path of vtenc_output_callback. --- v2: Fix inverted check on status before free node in vtenc_populate_extradata libavcodec/videotoolboxenc.c | 76 ++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 03e3c9ad42..0b10c3baa8 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -347,8 +347,7 @@ static void set_async_error(VTEncContext *vtctx, int err) while (info) { BufNode *next = info->next; - CFRelease(info->cm_buffer); - av_free(info); + vtenc_free_buf_node(info); info = next; } @@ -438,19 +437,8 @@ static int vtenc_q_pop(VTEncContext *vtctx, bool wait, CMSampleBufferRef *buf, E return 0; } -static void vtenc_q_push(VTEncContext *vtctx, CMSampleBufferRef buffer, ExtraSEI *sei) +static void vtenc_q_push(VTEncContext *vtctx, BufNode *info) { - BufNode *info = av_malloc(sizeof(BufNode)); - if (!info) { - set_async_error(vtctx, AVERROR(ENOMEM)); - return; - } - - CFRetain(buffer); - info->cm_buffer = buffer; - info->sei = sei; - info->next = NULL; - pthread_mutex_lock(&vtctx->lock); if (!vtctx->q_head) { @@ -726,6 +714,22 @@ static int set_extradata(AVCodecContext *avctx, CMSampleBufferRef sample_buffer) return 0; } +static void vtenc_free_buf_node(BufNode *info) +{ + if (!info) + return; + + if (info->sei) { + av_free(info->sei->data); + av_free(info->sei); + } + + if (info->cm_buffer) + CFRelease(info->cm_buffer); + + av_free(info); +} + static void vtenc_output_callback( void *ctx, void *sourceFrameCtx, @@ -735,13 +739,15 @@ static void vtenc_output_callback( { AVCodecContext *avctx = ctx; VTEncContext *vtctx = avctx->priv_data; - ExtraSEI *sei = sourceFrameCtx; + BufNode *info = sourceFrameCtx; if (vtctx->async_error) { + vtenc_free_buf_node(info); return; } if (status) { + vtenc_free_buf_node(info); av_log(avctx, AV_LOG_ERROR, "Error encoding frame: %d\n", (int)status); set_async_error(vtctx, AVERROR_EXTERNAL); return; @@ -751,15 +757,19 @@ static void vtenc_output_callback( return; } + CFRetain(sample_buffer); + info->cm_buffer = sample_buffer; + if (!avctx->extradata && (avctx->flags & AV_CODEC_FLAG_GLOBAL_HEADER)) { int set_status = set_extradata(avctx, sample_buffer); if (set_status) { + vtenc_free_buf_node(info); set_async_error(vtctx, set_status); return; } } - vtenc_q_push(vtctx, sample_buffer, sei); + vtenc_q_push(vtctx, info); } static int get_length_code_size( @@ -2565,19 +2575,23 @@ static int vtenc_send_frame(AVCodecContext *avctx, const AVFrame *frame) { CMTime time; - CFDictionaryRef frame_dict; + CFDictionaryRef frame_dict = NULL; CVPixelBufferRef cv_img = NULL; AVFrameSideData *side_data = NULL; + BufNode *node = av_mallocz(sizeof(*node)); ExtraSEI *sei = NULL; - int status = create_cv_pixel_buffer(avctx, frame, &cv_img); + int status; - if (status) return status; + if (!node) + return AVERROR(ENOMEM); + + status = create_cv_pixel_buffer(avctx, frame, &cv_img); + if (status) + goto out; status = create_encoder_dict_h264(frame, &frame_dict); - if (status) { - CFRelease(cv_img); - return status; - } + if (status) + goto out; #if CONFIG_ATSC_A53 side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_A53_CC); @@ -2587,6 +2601,7 @@ static int vtenc_send_frame(AVCodecContext *avctx, status = AVERROR(ENOMEM); goto out; } + node->sei = sei; status = ff_alloc_a53_sei(frame, 0, &sei->data, &sei->size); if (status < 0) { av_free(sei); @@ -2602,7 +2617,7 @@ static int vtenc_send_frame(AVCodecContext *avctx, time, kCMTimeInvalid, frame_dict, - sei, + node, NULL ); @@ -2616,7 +2631,10 @@ static int vtenc_send_frame(AVCodecContext *avctx, out: if (frame_dict) CFRelease(frame_dict); - CFRelease(cv_img); + if (cv_img) + CFRelease(cv_img); + if (status) + vtenc_free_buf_node(node); return status; } @@ -2701,6 +2719,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, CVPixelBufferRef pix_buf = NULL; CMTime time; CMSampleBufferRef buf = NULL; + BufNode *node = av_mallocz(sizeof(*node)); + + if (!node) + return AVERROR(ENOMEM); status = vtenc_create_encoder(avctx, codec_type, @@ -2736,7 +2758,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, time, kCMTimeInvalid, NULL, - NULL, + node, NULL); if (status) { @@ -2747,6 +2769,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx, status = AVERROR_EXTERNAL; goto pe_cleanup; } + node = NULL; //Populates extradata - output frames are flushed and param sets are available. status = VTCompressionSessionCompleteFrames(vtctx->session, @@ -2773,6 +2796,7 @@ pe_cleanup: vtctx->frame_ct_out = 0; av_assert0(status != 0 || (avctx->extradata && avctx->extradata_size > 0)); + vtenc_free_buf_node(node); return status; }