* [FFmpeg-devel] [PATCH 4/4] avcodec/videotoolboxenc: fix error code
@ 2023-01-04 2:35 Zhao Zhili
2023-01-04 2:38 ` Steven Liu
0 siblings, 1 reply; 3+ messages in thread
From: Zhao Zhili @ 2023-01-04 2:35 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
From: Zhao Zhili <zhilizhao@tencent.com>
1. Fix return 0 on success.
2. Fix return OS error code passthrough.
---
libavcodec/videotoolboxenc.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 3b00e542cb..56971471e4 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
if(!pool){
av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n");
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
if(status != kCVReturnSuccess){
av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status);
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
AV_LOG_ERROR,
"Error sending frame for extradata: %d\n",
status);
-
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
}
@@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
status = VTCompressionSessionCompleteFrames(vtctx->session,
kCMTimeIndefinite);
- if (status)
+ if (status) {
+ status = AVERROR_EXTERNAL;
goto pe_cleanup;
+ }
status = vtenc_q_pop(vtctx, 0, &buf, NULL);
if (status) {
--
2.35.3
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH 4/4] avcodec/videotoolboxenc: fix error code
2023-01-04 2:35 [FFmpeg-devel] [PATCH 4/4] avcodec/videotoolboxenc: fix error code Zhao Zhili
@ 2023-01-04 2:38 ` Steven Liu
2023-01-11 3:24 ` "zhilizhao(赵志立)"
0 siblings, 1 reply; 3+ messages in thread
From: Steven Liu @ 2023-01-04 2:38 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Zhao Zhili
Zhao Zhili <quinkblack@foxmail.com> 于2023年1月4日周三 10:35写道：
>
> From: Zhao Zhili <zhilizhao@tencent.com>
>
> 1. Fix return 0 on success.
> 2. Fix return OS error code passthrough.
> ---
> libavcodec/videotoolboxenc.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
> index 3b00e542cb..56971471e4 100644
> --- a/libavcodec/videotoolboxenc.c
> +++ b/libavcodec/videotoolboxenc.c
> @@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
> pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
> if(!pool){
> av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n");
> + status = AVERROR_EXTERNAL;
> goto pe_cleanup;
> }
>
> @@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
>
> if(status != kCVReturnSuccess){
> av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status);
> + status = AVERROR_EXTERNAL;
> goto pe_cleanup;
> }
>
> @@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
> AV_LOG_ERROR,
> "Error sending frame for extradata: %d\n",
> status);
> -
> + status = AVERROR_EXTERNAL;
> goto pe_cleanup;
> }
>
> @@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
> status = VTCompressionSessionCompleteFrames(vtctx->session,
> kCMTimeIndefinite);
>
> - if (status)
> + if (status) {
> + status = AVERROR_EXTERNAL;
> goto pe_cleanup;
> + }
>
> status = vtenc_q_pop(vtctx, 0, &buf, NULL);
> if (status) {
> --
> 2.35.3
>
> _______________________________________________
> 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".
LGTM
Thanks
Steven
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH 4/4] avcodec/videotoolboxenc: fix error code
2023-01-04 2:38 ` Steven Liu
@ 2023-01-11 3:24 ` "zhilizhao(赵志立)"
0 siblings, 0 replies; 3+ messages in thread
From: "zhilizhao(赵志立)" @ 2023-01-11 3:24 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> On Jan 4, 2023, at 10:38, Steven Liu <lingjiujianke@gmail.com> wrote:
>
> Zhao Zhili <quinkblack@foxmail.com> 于2023年1月4日周三 10:35写道：
>>
>> From: Zhao Zhili <zhilizhao@tencent.com>
>>
>> 1. Fix return 0 on success.
>> 2. Fix return OS error code passthrough.
>> ---
>> libavcodec/videotoolboxenc.c | 8 ++++++--
>> 1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
>> index 3b00e542cb..56971471e4 100644
>> --- a/libavcodec/videotoolboxenc.c
>> +++ b/libavcodec/videotoolboxenc.c
>> @@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
>> pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
>> if(!pool){
>> av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n");
>> + status = AVERROR_EXTERNAL;
>> goto pe_cleanup;
>> }
>>
>> @@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
>>
>> if(status != kCVReturnSuccess){
>> av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status);
>> + status = AVERROR_EXTERNAL;
>> goto pe_cleanup;
>> }
>>
>> @@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
>> AV_LOG_ERROR,
>> "Error sending frame for extradata: %d\n",
>> status);
>> -
>> + status = AVERROR_EXTERNAL;
>> goto pe_cleanup;
>> }
>>
>> @@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
>> status = VTCompressionSessionCompleteFrames(vtctx->session,
>> kCMTimeIndefinite);
>>
>> - if (status)
>> + if (status) {
>> + status = AVERROR_EXTERNAL;
>> goto pe_cleanup;
>> + }
>>
>> status = vtenc_q_pop(vtctx, 0, &buf, NULL);
>> if (status) {
>> --
>> 2.35.3
>>
>> _______________________________________________
>> 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".
>
>
> LGTM
Pushed patch v2 with minor change of commit message, thanks for the review.
>
> Thanks
> Steven
>
>
>
_______________________________________________
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".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-11 3:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-04 2:35 [FFmpeg-devel] [PATCH 4/4] avcodec/videotoolboxenc: fix error code Zhao Zhili
2023-01-04 2:38 ` Steven Liu
2023-01-11 3:24 ` "zhilizhao(赵志立)"
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git