RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/bsf: use simplified algorithm for bsf_list chained filtering 

Based on the one in ffmpeg.c and it is not using an extra flush_idx variable.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-03-30 01:31:43 +02:00
parent 403bee30a5
commit 7d89445473
1 changed files with 25 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libavcodec/bsf.c
View File

@ -18,6 +18,7 @@
#include <string.h> #include <string.h>
#include "libavutil/avassert.h"
#include "libavutil/log.h" #include "libavutil/log.h"
#include "libavutil/mem.h" #include "libavutil/mem.h"
#include "libavutil/opt.h" #include "libavutil/opt.h"
@ -266,7 +267,6 @@ typedef struct BSFListContext {
int nb_bsfs; int nb_bsfs;
unsigned idx; // index of currently processed BSF unsigned idx; // index of currently processed BSF
unsigned flushed_idx; // index of BSF being flushed
char * item_name; char * item_name;
} BSFListContext; } BSFListContext;
@ -304,57 +304,43 @@ fail:
static int bsf_list_filter(AVBSFContext *bsf, AVPacket *out) static int bsf_list_filter(AVBSFContext *bsf, AVPacket *out)
{ {
BSFListContext *lst = bsf->priv_data; BSFListContext *lst = bsf->priv_data;
int ret; int ret, eof = 0;
if (!lst->nb_bsfs) if (!lst->nb_bsfs)
return ff_bsf_get_packet_ref(bsf, out); return ff_bsf_get_packet_ref(bsf, out);
while (1) { while (1) {
if (lst->idx > lst->flushed_idx) { /* get a packet from the previous filter up the chain */
if (lst->idx)
ret = av_bsf_receive_packet(lst->bsfs[lst->idx-1], out); ret = av_bsf_receive_packet(lst->bsfs[lst->idx-1], out);
if (ret == AVERROR(EAGAIN)) { else
/* no more packets from idx-1, try with previous */
lst->idx--;
continue;
} else if (ret == AVERROR_EOF) {
/* filter idx-1 is done, continue with idx...nb_bsfs */
lst->flushed_idx = lst->idx;
continue;
}else if (ret < 0) {
/* filtering error */
break;
}
} else {
ret = ff_bsf_get_packet_ref(bsf, out); ret = ff_bsf_get_packet_ref(bsf, out);
if (ret == AVERROR_EOF) { if (ret == AVERROR(EAGAIN)) {
lst->idx = lst->flushed_idx; if (!lst->idx)
} else if (ret < 0) return ret;
break; lst->idx--;
} continue;
} else if (ret == AVERROR_EOF) {
eof = 1;
} else if (ret < 0)
return ret;
/* send it to the next filter down the chain */
if (lst->idx < lst->nb_bsfs) { if (lst->idx < lst->nb_bsfs) {
AVPacket *pkt; ret = av_bsf_send_packet(lst->bsfs[lst->idx], eof ? NULL : out);
if (ret == AVERROR_EOF && lst->idx == lst->flushed_idx) { av_assert1(ret != AVERROR(EAGAIN));
/* ff_bsf_get_packet_ref returned EOF and idx is first if (ret < 0) {
* filter of yet not flushed filter chain */ av_packet_unref(out);
pkt = NULL; return ret;
} else {
pkt = out;
} }
ret = av_bsf_send_packet(lst->bsfs[lst->idx], pkt);
if (ret < 0)
break;
lst->idx++; lst->idx++;
eof = 0;
} else if (eof) {
return ret;
} else { } else {
/* The end of filter chain, break to return result */ return 0;
break;
} }
} }
if (ret < 0)
av_packet_unref(out);
return ret;
} }
static void bsf_list_flush(AVBSFContext *bsf) static void bsf_list_flush(AVBSFContext *bsf)
@ -363,7 +349,7 @@ static void bsf_list_flush(AVBSFContext *bsf)
for (int i = 0; i < lst->nb_bsfs; i++) for (int i = 0; i < lst->nb_bsfs; i++)
av_bsf_flush(lst->bsfs[i]); av_bsf_flush(lst->bsfs[i]);
lst->idx = lst->flushed_idx = 0; lst->idx = 0;
} }
static void bsf_list_close(AVBSFContext *bsf) static void bsf_list_close(AVBSFContext *bsf)