*/
#include "libavutil/avassert.h"
-#include "avcodec.h"
+
#include "bsf.h"
+#include "bsf_internal.h"
#include "get_bits.h"
#define MAX_CACHE 8
return 0;
}
-static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
+static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *pkt)
{
GetBitContext gb;
VP9BSFContext *s = ctx->priv_data;
- AVPacket *in;
int res, invisible, profile, marker, uses_superframe_syntax = 0, n;
- res = ff_bsf_get_packet(ctx, &in);
+ res = ff_bsf_get_packet_ref(ctx, pkt);
if (res < 0)
return res;
- marker = in->data[in->size - 1];
+ marker = pkt->data[pkt->size - 1];
if ((marker & 0xe0) == 0xc0) {
int nbytes = 1 + ((marker >> 3) & 0x3);
int n_frames = 1 + (marker & 0x7), idx_sz = 2 + n_frames * nbytes;
- uses_superframe_syntax = in->size >= idx_sz && in->data[in->size - idx_sz] == marker;
+ uses_superframe_syntax = pkt->size >= idx_sz && pkt->data[pkt->size - idx_sz] == marker;
}
- if ((res = init_get_bits8(&gb, in->data, in->size)) < 0)
+ if ((res = init_get_bits8(&gb, pkt->data, pkt->size)) < 0)
goto done;
get_bits(&gb, 2); // frame marker
goto done;
} else if ((!invisible || uses_superframe_syntax) && !s->n_cache) {
// passthrough
- av_packet_move_ref(out, in);
- goto done;
+ return 0;
} else if (s->n_cache + 1 >= MAX_CACHE) {
av_log(ctx, AV_LOG_ERROR,
"Too many invisible frames\n");
goto done;
}
- av_packet_move_ref(s->cache[s->n_cache++], in);
+ av_packet_move_ref(s->cache[s->n_cache++], pkt);
if (invisible) {
- res = AVERROR(EAGAIN);
- goto done;
+ return AVERROR(EAGAIN);
}
av_assert0(s->n_cache > 0);
// build superframe
- if ((res = merge_superframe(s->cache, s->n_cache, out)) < 0)
+ if ((res = merge_superframe(s->cache, s->n_cache, pkt)) < 0)
goto done;
- res = av_packet_copy_props(out, s->cache[s->n_cache - 1]);
+ res = av_packet_copy_props(pkt, s->cache[s->n_cache - 1]);
if (res < 0)
goto done;
done:
if (res < 0)
- av_packet_unref(out);
- av_packet_free(&in);
+ av_packet_unref(pkt);
return res;
}