[FFmpeg-cvslog] avcodec/audiotoolboxenc: return external error if encode failed
Steven Liu
git at videolan.org
Fri Jun 24 10:04:10 EEST 2022
ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Fri Jun 24 13:55:41 2022 +0800| [7c05b7951cb47716230c95744240bc60ec5f9433] | committer: Steven Liu
avcodec/audiotoolboxenc: return external error if encode failed
because the AudioConverterFillComplexBuffer can return 0 or 1 if
success.
so set the ret to 0 it AudioConverterFillComplexBuffer success and
return ret value for success or return AVERROR_EXTERNAL when
AudioConverterFillComplexBuffer failed.
BTW change the error message log level from warning to error.
Reviewed-by: Zhao Zhili <zhilizhao at tencent.com>
Signed-off-by: Steven Liu <lq at chinaffmpeg.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c05b7951cb47716230c95744240bc60ec5f9433
---
libavcodec/audiotoolboxenc.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c
index f8305ab89b..00293154bf 100644
--- a/libavcodec/audiotoolboxenc.c
+++ b/libavcodec/audiotoolboxenc.c
@@ -554,11 +554,13 @@ static int ffat_encode(AVCodecContext *avctx, AVPacket *avpkt,
avctx->frame_size,
&avpkt->pts,
&avpkt->duration);
+ ret = 0;
} else if (ret && ret != 1) {
- av_log(avctx, AV_LOG_WARNING, "Encode error: %i\n", ret);
+ av_log(avctx, AV_LOG_ERROR, "Encode error: %i\n", ret);
+ ret = AVERROR_EXTERNAL;
}
- return 0;
+ return ret;
}
static av_cold void ffat_encode_flush(AVCodecContext *avctx)
More information about the ffmpeg-cvslog
mailing list