From patchwork Sun Jul 7 10:21:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 50384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp5227859vqv; Sun, 7 Jul 2024 03:22:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU4AC+X2qZI2Cjz4xSO0y+5LJp7chnSyOHybU7WUQuEk2BoUkbUMCcOyUmIbPjrz044OiG+GIgeUt+P+KCdl+yrAhqx1widDrb8+Q== X-Google-Smtp-Source: AGHT+IGMPpu3sjXLJUEPZkpd/qPOGAXdIpgyBEVSQbVyvhKeVLD6UsyBDqxOq/AimJWaHCPYhsPs X-Received: by 2002:a17:906:370f:b0:a77:ecf0:84e5 with SMTP id a640c23a62f3a-a77ecf08c1bmr146893466b.14.1720347759092; Sun, 07 Jul 2024 03:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720347759; cv=none; d=google.com; s=arc-20160816; b=m7YtX15cqV4E4sLR74SYZLUFEaAiy30+JO+rr19CB3Yknob8zYZq4LAHa0DE3EmKbF eScI6qa0F6ttWXQT5K6kmM4LscsaxLUUq+Ao3kkJVX0367zFC6+XodHrxcTTJIhC4dnB JbVTQQbk66ukoOMIb+irDqCuYZWjaFpG6Se1AniMHxdzicOLpFLPcmLZ0LjcFAji2OJJ wiyFafxzDz0/D9Gyfq6IEiNp9fAh7DiJtsqb1rMHMAePhmEpBLqc8q15Z5hVdG/uqQiw yYBWgo4xU/EL19BvJa+w+dCYF0HR+DL172zGkk9B9Fb52NzB7wltTAm1PBe6L47GarJF yq8w== 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=yAk+KszbJqaTqpESuNWGQRFnncyfI9/H/xLefLXbn5g=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=k/5ZiOJhW5rFGb3JCrqL2RDmvWmrjGzMKliFcT//8gOta3MI5sESXi/4Z8/Hs0lQ7i Htbl6sersBT7pQTH8tpdl48oeyG4yAAZtnJYLLhXWNhsJ8vL3pLXuZB/FTxH+NfQ63Bm nKn1XzcfOhBh3o15+fc3FZ/Nq5+1z69DE25c6PRaV+k5My0RUdpFyQnDU7ywuI1Fb1K7 urQmz2Gn7regvmbMr9dW9gYpiFpgh0htdJ+jgwxv1JdttIxDrvYT8eh4fJGeLT3B1mpj 7gdkO/lo4ujnU92ZNMwNnk8yHTUUAGp9dyisHlUJ/7X7L8vXBGhb5P4/2cf7raDJBZ4b R+Hw==; 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=goVP8Rmk; 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 a640c23a62f3a-a77e3fa4f1csi149045066b.15.2024.07.07.03.22.38; Sun, 07 Jul 2024 03:22:39 -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=goVP8Rmk; 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 DE95068DB1B; Sun, 7 Jul 2024 13:22:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-73.mail.qq.com (out203-205-251-73.mail.qq.com [203.205.251.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C989468DA69 for ; Sun, 7 Jul 2024 13:21:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1720347696; bh=9XkA8NS0uRcnbbZKYZtKeB6aeunem06uAffdftD2i0s=; h=From:To:Cc:Subject:Date; b=goVP8RmksGlI9Q6rlegcXqkgQqUJcb4LkVW3P/7JEYW4Pp712ezDesxLDczb/Panf uLgV7T0JI9/mKtTLnJ0c8CDFwz0hEKqT3EMJYgzMS33sW3BjuSm7dkWVzvN+ReDNtv mdib8sYlP//8dUhWaxuaa3+BXfBLbH+RAJVbU9KY= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.28.29]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id 5633A86C; Sun, 07 Jul 2024 18:21:35 +0800 X-QQ-mid: xmsmtpt1720347695t7lzvx2rh Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeieY7Y3CVPCVCPolBHj9nJJFiVdtf/ACkCop6YC74FbF2tZL3xpeY UgzeDGVsfnk68rq4T3HEfaMNMW3vnGrAqyaCnV/HYxyZo5thmSWVObWxNMt4vWL27Ruu0fZf9ReD zWhvxUXtHY9tUxY+EW5oFkr8/Sn2ymoBZ+en1gckV29kk5jNKy9/ceZeCcgONA0cHZzd1N0xzPyA yrfehsvFhvS4ZpOHH+NbiZeHaTicZvMYE5rMVKeLtJViX9Oh1/+MJcA9MIBW3/IoNJRX7Xcc67uO sfNifazyHe3+2NkmhsAP+5S8oN7ByY9OlsZdWz3kAb03KIGZt0Qz0rRJcNDeo2pT+WEU75X9dH4p NxS2AJAiT1s8jhMP+MDE/uImMCCXevK4JLiYJp+WpAo71odoriCw7l0nbAMEIWfzso1r/M/4VE4M OOPdJ1sd9PKI1C/hj2P2o0+mBE8A0FPMX4zZBiWG05Mm9Rt/dWK0K2TRTEGmbTI0l/iIldtJg0JH ApuUFdV0TnLp19Tv5KNUHQ62VCPjpriIKAWmWMayer2TUpjaJqAppXgasIRYE5+uujXmQhIvV4ot UVkhx6p1LBjdinJFkMUBrrZrY+vKj7PbQX6U0blDOpWCc83lBoN2Md8umSo7aDa4VpypbQAdXev3 bIXcM0k9OdGQVEOvxo7r0Y4wh/ISDpiTfAytEh6jNK1mkOqD/m4g6P/NdnMdzg7EJ91n8x9L5hEs vJUwu0WPBGtGpGozdWtlTcatTuhRNkMeEVDQkkTGZW0uTpsfq5L0WeUi3mBAjtK46BCBGqVEJDFw yClTY1IB4pxMp1X+yGO6s2NeMiaxvxuN6tvZT6BaPSSHGP9KbtTXUa0AofbRw0a3njtfHOTGmEFY nphxXRBf/YpktTOLosMk8vlQhpTFdE75GY3V5XEOdXIc/LqA0vzPHoKjbbcwKuMbZic3s8T8WLe1 3LrHcTnw0xuBrpLkoRJDf3qKkXadZ0 X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Jul 2024 18:21:30 +0800 X-OQ-MSGID: <20240707102134.93935-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] avcodec/videotoolboxenc: Don't ignore ENOMEM 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: jE+KiVRwRF+s From: Zhao Zhili --- libavcodec/videotoolboxenc.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 42065cbcb3..91ee507050 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -2585,14 +2585,13 @@ static int vtenc_send_frame(AVCodecContext *avctx, if (vtctx->a53_cc && side_data && side_data->size) { sei = av_mallocz(sizeof(*sei)); if (!sei) { - av_log(avctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - } else { - int ret = ff_alloc_a53_sei(frame, 0, &sei->data, &sei->size); - if (ret < 0) { - av_log(avctx, AV_LOG_ERROR, "Not enough memory for closed captions, skipping\n"); - av_free(sei); - sei = NULL; - } + status = AVERROR(ENOMEM); + goto out; + } + status = ff_alloc_a53_sei(frame, 0, &sei->data, &sei->size); + if (status < 0) { + av_free(sei); + goto out; } } #endif @@ -2608,15 +2607,19 @@ static int vtenc_send_frame(AVCodecContext *avctx, NULL ); - if (frame_dict) CFRelease(frame_dict); - CFRelease(cv_img); - if (status) { av_log(avctx, AV_LOG_ERROR, "Error: cannot encode frame: %d\n", status); - return AVERROR_EXTERNAL; + status = AVERROR_EXTERNAL; + // Not necessary, just in case new code put after here + goto out; } - return 0; +out: + if (frame_dict) + CFRelease(frame_dict); + CFRelease(cv_img); + + return status; } static av_cold int vtenc_frame(