har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vp9_superframe_bsf: convert to the new bitstream reader

Browse Source
This commit is contained in:
Anton Khirnov 2017-04-26 09:25:05 +02:00
parent 3daaa44173
commit 126bc2c33b
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/vp9_superframe_bsf.c
View File

@ -21,8 +21,8 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h"
#include "bsf.h" #include "bsf.h"
#include "get_bits.h"
#define MAX_CACHE 8 #define MAX_CACHE 8
typedef struct VP9BSFContext { typedef struct VP9BSFContext {
@ -101,7 +101,7 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out) static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
{ {
GetBitContext gb; BitstreamContext bc;
VP9BSFContext *s = ctx->priv_data; VP9BSFContext *s = ctx->priv_data;
AVPacket *in; AVPacket *in;
int res, invisible, profile, marker, uses_superframe_syntax = 0, n; int res, invisible, profile, marker, uses_superframe_syntax = 0, n;
@ -118,19 +118,21 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
uses_superframe_syntax = in->size >= idx_sz && in->data[in->size - idx_sz] == marker; uses_superframe_syntax = in->size >= idx_sz && in->data[in->size - idx_sz] == marker;
} }
if ((res = init_get_bits8(&gb, in->data, in->size)) < 0) res = bitstream_init8(&bc, in->data, in->size);
if (res < 0)
goto done; goto done;
get_bits(&gb, 2); // frame marker bitstream_read(&bc, 2); // frame marker
profile = get_bits1(&gb); profile = bitstream_read(&bc, 1);
profile |= get_bits1(&gb) << 1; profile |= bitstream_read(&bc, 1) << 1;
if (profile == 3) profile += get_bits1(&gb); if (profile == 3)
profile += bitstream_read(&bc, 1);
if (get_bits1(&gb)) { if (bitstream_read(&bc, 1)) {
invisible = 0; invisible = 0;
} else { } else {
get_bits1(&gb); // keyframe bitstream_read(&bc, 1); // keyframe
invisible = !get_bits1(&gb); invisible = !bitstream_read(&bc, 1);
} }
if (uses_superframe_syntax && s->n_cache > 0) { if (uses_superframe_syntax && s->n_cache > 0) {