virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/videotoolboxenc: fix error code

Browse Source 
1. Fix return 0 on error.
2. Fix return OS error code passthrough.

Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Zhao Zhili
2023-01-04 10:37:50 +08:00
parent e7aca339ce
commit 8f35ee8240
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/videotoolboxenc.c
View File

@@ -2555,6 +2555,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
pool = VTCompressionSessionGetPixelBufferPool(vtctx->session); pool = VTCompressionSessionGetPixelBufferPool(vtctx->session);
if(!pool){ if(!pool){
av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n"); av_log(avctx, AV_LOG_ERROR, "Error getting pixel buffer pool.\n");
status = AVERROR_EXTERNAL;
goto pe_cleanup; goto pe_cleanup;
} }
@@ -2564,6 +2565,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
if(status != kCVReturnSuccess){ if(status != kCVReturnSuccess){
av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status); av_log(avctx, AV_LOG_ERROR, "Error creating frame from pool: %d\n", status);
status = AVERROR_EXTERNAL;
goto pe_cleanup; goto pe_cleanup;
} }
@@ -2581,7 +2583,7 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
AV_LOG_ERROR, AV_LOG_ERROR,
"Error sending frame for extradata: %d\n", "Error sending frame for extradata: %d\n",
status); status);
status = AVERROR_EXTERNAL;
goto pe_cleanup; goto pe_cleanup;
} }
@@ -2589,8 +2591,10 @@ static int vtenc_populate_extradata(AVCodecContext *avctx,
status = VTCompressionSessionCompleteFrames(vtctx->session, status = VTCompressionSessionCompleteFrames(vtctx->session,
kCMTimeIndefinite); kCMTimeIndefinite);
if (status) if (status) {
status = AVERROR_EXTERNAL;
goto pe_cleanup; goto pe_cleanup;
}
status = vtenc_q_pop(vtctx, 0, &buf, NULL); status = vtenc_q_pop(vtctx, 0, &buf, NULL);
if (status) { if (status) {