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

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

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

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2018-03-20 01:19:19 -03:00
parent ed1f08bfb5
commit dc99ee6b08
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/noise_bsf.c
View File

@ -35,45 +35,38 @@ typedef struct NoiseContext {
unsigned int state; unsigned int state;
} NoiseContext; } NoiseContext;
static int noise(AVBSFContext *ctx, AVPacket *out) static int noise(AVBSFContext *ctx, AVPacket *pkt)
{ {
NoiseContext *s = ctx->priv_data; NoiseContext *s = ctx->priv_data;
AVPacket *in;
int amount = s->amount > 0 ? s->amount : (s->state % 10001 + 1); int amount = s->amount > 0 ? s->amount : (s->state % 10001 + 1);
int i, ret = 0; int i, ret = 0;
if (amount <= 0) if (amount <= 0)
return AVERROR(EINVAL); return AVERROR(EINVAL);
ret = ff_bsf_get_packet(ctx, &in); ret = ff_bsf_get_packet_ref(ctx, pkt);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (s->dropamount > 0 && s->state % s->dropamount == 0) { if (s->dropamount > 0 && s->state % s->dropamount == 0) {
s->state++; s->state++;
av_packet_free(&in); av_packet_unref(pkt);
return AVERROR(EAGAIN); return AVERROR(EAGAIN);
} }
ret = av_new_packet(out, in->size); ret = av_packet_make_writable(pkt);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
ret = av_packet_copy_props(out, in); for (i = 0; i < pkt->size; i++) {
if (ret < 0) s->state += pkt->data[i] + 1;
goto fail;
memcpy(out->data, in->data, in->size);
for (i = 0; i < out->size; i++) {
s->state += out->data[i] + 1;
if (s->state % amount == 0) if (s->state % amount == 0)
out->data[i] = s->state; pkt->data[i] = s->state;
} }
fail: fail:
if (ret < 0) if (ret < 0)
av_packet_unref(out); av_packet_unref(pkt);
av_packet_free(&in);
return ret; return ret;
} }