virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avcodec/vp9_superframe_split: move the reference in the bsf internal buffer

Browse Source 
There's no need to allocate a new packet for it.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2018-03-16 18:58:04 -03:00
parent cbbefc05b1
commit e4eaaf7bf6
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
libavcodec/vp9_superframe_split_bsf.c
View File

@@ -30,7 +30,7 @@
#include "get_bits.h" #include "get_bits.h"
typedef struct VP9SFSplitContext { typedef struct VP9SFSplitContext {
AVPacket *buffer_pkt; AVPacket buffer_pkt;
int nb_frames; int nb_frames;
int next_frame; int next_frame;
@@ -43,13 +43,13 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
VP9SFSplitContext *s = ctx->priv_data; VP9SFSplitContext *s = ctx->priv_data;
AVPacket *in; AVPacket *in;
int i, j, ret, marker; int i, j, ret, marker;
int is_superframe = !!s->buffer_pkt; int is_superframe = !!s->buffer_pkt.data;
if (!s->buffer_pkt) { if (!s->buffer_pkt.data) {
ret = ff_bsf_get_packet(ctx, &s->buffer_pkt); ret = ff_bsf_get_packet_ref(ctx, &s->buffer_pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
in = s->buffer_pkt; in = &s->buffer_pkt;
marker = in->data[in->size - 1]; marker = in->data[in->size - 1];
if ((marker & 0xe0) == 0xc0) { if ((marker & 0xe0) == 0xc0) {
@@ -90,7 +90,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
GetBitContext gb; GetBitContext gb;
int profile, invisible = 0; int profile, invisible = 0;
ret = av_packet_ref(out, s->buffer_pkt); ret = av_packet_ref(out, &s->buffer_pkt);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@@ -101,7 +101,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
s->next_frame++; s->next_frame++;
if (s->next_frame >= s->nb_frames) if (s->next_frame >= s->nb_frames)
av_packet_free(&s->buffer_pkt); av_packet_unref(&s->buffer_pkt);
ret = init_get_bits8(&gb, out->data, out->size); ret = init_get_bits8(&gb, out->data, out->size);
if (ret < 0) if (ret < 0)
@@ -121,20 +121,19 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out)
out->pts = AV_NOPTS_VALUE; out->pts = AV_NOPTS_VALUE;
} else { } else {
av_packet_move_ref(out, s->buffer_pkt); av_packet_move_ref(out, &s->buffer_pkt);
av_packet_free(&s->buffer_pkt);
} }
return 0; return 0;
fail: fail:
av_packet_free(&s->buffer_pkt); av_packet_unref(&s->buffer_pkt);
return ret; return ret;
} }
static void vp9_superframe_split_uninit(AVBSFContext *ctx) static void vp9_superframe_split_uninit(AVBSFContext *ctx)
{ {
VP9SFSplitContext *s = ctx->priv_data; VP9SFSplitContext *s = ctx->priv_data;
av_packet_free(&s->buffer_pkt); av_packet_unref(&s->buffer_pkt);
} }
const AVBitStreamFilter ff_vp9_superframe_split_bsf = { const AVBitStreamFilter ff_vp9_superframe_split_bsf = {