On 02/11/18 13:30, hwren wrote:
> Signed-off-by: hwren
> ---
> libavcodec/libdavs2.c | 12 +++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
> index cadf995..e36bfed 100644
> --- a/libavcodec/libdavs2.c
> +++ b/libavcodec/libdavs2.c
> @@ -129,7 +129,17 @@ static int davs2_decode_frame(AVCodecContext *avctx,
> void *data,
> int ret = DAVS2_DEFAULT;
>
> if (!buf_size) {
> -return 0;
> +ret = davs2_decoder_flush(cad->decoder, >headerset,
> >out_frame);
> +if (ret == DAVS2_END) {
> +return 0;
> +} else if (ret == DAVS2_GOT_FRAME) {
> +*got_frame = davs2_dump_frames(avctx, >out_frame,
> >headerset, ret, frame);
> +davs2_decoder_frame_unref(cad->decoder, >out_frame);
> +return ret;
This returns a library-internal value to the user, which doesn't look right.
> +} else {
> +av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames
> failed\n");
> +return AVERROR_EXTERNAL;
> +}
> }
>
> cad->packet.data = buf_ptr;
>
On 02/11/18 13:30, hwren wrote:
> Signed-off-by: hwren
> ---
> libavcodec/libdavs2.c | 20 ++--
> 1 file changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
> index 3e59d41..6e4bd50 100644
> --- a/libavcodec/libdavs2.c
> +++ b/libavcodec/libdavs2.c
> @@ -147,15 +147,17 @@ static int davs2_decode_frame(AVCodecContext *avctx,
> void *data,
> if (!buf_size) {
> ret = davs2_decoder_flush(cad->decoder, >headerset,
> >out_frame);
> if (ret == DAVS2_END) {
> -return 0;
> +ret = 0;
> } else if (ret == DAVS2_GOT_FRAME) {
> -*got_frame = davs2_dump_frames(avctx, >out_frame,
> >headerset, ret, frame);
> +ret = davs2_dump_frames(avctx, >out_frame, >headerset,
> ret, frame);
> davs2_decoder_frame_unref(cad->decoder, >out_frame);
> -return ret;
> +if (ret == 0 || ret == 1) {
> +*got_frame = ret;
> +}
> } else {
> -av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames
> failed\n");
> -return AVERROR_EXTERNAL;
> +av_log(avctx, AV_LOG_ERROR, "Decoder error: flush frames
> failed\n");
So does this one.
> }
> +return ret;
> }
>
> cad->packet.data = buf_ptr;
> @@ -174,8 +176,14 @@ static int davs2_decode_frame(AVCodecContext *avctx,
> void *data,
> ret = davs2_decoder_recv_frame(cad->decoder, >headerset,
> >out_frame);
>
> if (ret != DAVS2_DEFAULT) {
> -*got_frame = davs2_dump_frames(avctx, >out_frame,
> >headerset, ret, frame);
> +ret = davs2_dump_frames(avctx, >out_frame, >headerset,
> ret, frame);
> davs2_decoder_frame_unref(cad->decoder, >out_frame);
> +if (ret == 0 || ret == 1) {
> +*got_frame = ret;
> +} else {
> +av_log(avctx, AV_LOG_ERROR, "Decoder error: dump frames
> failed\n");
> +return ret;
> +}
> }
>
> return buf_size;
>
Patches 2 and 3 applied.
Thanks,
- Mark
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
