highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filter_units: Don't use fake loop

Browse Source 
According to the BSF API, when a BSF is finished with an input packet,
it should return AVERROR(EAGAIN) to signal that another packet should be
sent to the BSF via av_bsf_send_packet that the actual BSF can receive
via ff_bsf_get_packet[_ref]. filter_units on the other hand simply called
ff_bsf_get_packet again if the first packet received didn't result in
any output. This call of course returned AVERROR(EAGAIN) which was
returned, but it is nevertheless better to not include a fake loop.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-06-17 05:42:09 +02:00 committed by Mark Thompson
parent 45fd7e44a4
commit 83be17cfcd
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/filter_units_bsf.c
View File

@ -105,7 +105,6 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out)
AVPacket *in = NULL;
int err, i, j;
while (1) {
err = ff_bsf_get_packet(bsf, &in);
if (err < 0)
return err;
@ -134,12 +133,10 @@ static int filter_units_filter(AVBSFContext *bsf, AVPacket *out)
}
}
if (frag->nb_units > 0)
break;
if (frag->nb_units == 0) {
// Don't return packets with nothing in them.
av_packet_free(&in);
ff_cbs_fragment_reset(ctx->cbc, frag);
err = AVERROR(EAGAIN);
goto fail;
}
err = ff_cbs_write_packet(ctx->cbc, out, frag);