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

Merge commit '3fb6b98b5e247434456916c35ba7e08efa03e85d' 

* commit '3fb6b98b5e247434456916c35ba7e08efa03e85d':
  vp9_superframe_bsf: cache input packets directly

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-31 12:09:53 -03:00
parent a8305b0ea3 3fb6b98b5e
commit e1bc3f4396
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libavcodec/vp9_superframe_bsf.c
View File

@ -27,20 +27,17 @@
#define MAX_CACHE 8 #define MAX_CACHE 8
typedef struct VP9BSFContext { typedef struct VP9BSFContext {
int n_cache; int n_cache;
struct CachedBuf { AVPacket *cache[MAX_CACHE];
uint8_t *data;
int size;
} cache[MAX_CACHE];
} VP9BSFContext; } VP9BSFContext;
static void stats(const struct CachedBuf *in, int n_in, static void stats(AVPacket * const *in, int n_in,
unsigned *_max, unsigned *_sum) unsigned *_max, unsigned *_sum)
{ {
int n; int n;
unsigned max = 0, sum = 0; unsigned max = 0, sum = 0;
for (n = 0; n < n_in; n++) { for (n = 0; n < n_in; n++) {
unsigned sz = in[n].size; unsigned sz = in[n]->size;
if (sz > max) if (sz > max)
max = sz; max = sz;
@ -51,7 +48,7 @@ static void stats(const struct CachedBuf *in, int n_in,
*_sum = sum; *_sum = sum;
} }
static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out) static int merge_superframe(AVPacket * const *in, int n_in, AVPacket *out)
{ {
unsigned max, sum, mag, marker, n, sz; unsigned max, sum, mag, marker, n, sz;
uint8_t *ptr; uint8_t *ptr;
@ -66,8 +63,8 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
return res; return res;
ptr = out->data; ptr = out->data;
for (n = 0; n < n_in; n++) { for (n = 0; n < n_in; n++) {
memcpy(ptr, in[n].data, in[n].size); memcpy(ptr, in[n]->data, in[n]->size);
ptr += in[n].size; ptr += in[n]->size;
} }
#define wloop(mag, wr) \ #define wloop(mag, wr) \
@ -82,16 +79,16 @@ static int merge_superframe(const struct CachedBuf *in, int n_in, AVPacket *out)
*ptr++ = marker; *ptr++ = marker;
switch (mag) { switch (mag) {
case 0: case 0:
wloop(mag, *ptr = in[n].size); wloop(mag, *ptr = in[n]->size);
break; break;
case 1: case 1:
wloop(mag, AV_WL16(ptr, in[n].size)); wloop(mag, AV_WL16(ptr, in[n]->size));
break; break;
case 2: case 2:
wloop(mag, AV_WL24(ptr, in[n].size)); wloop(mag, AV_WL24(ptr, in[n]->size));
break; break;
case 3: case 3:
wloop(mag, AV_WL32(ptr, in[n].size)); wloop(mag, AV_WL32(ptr, in[n]->size));
break; break;
} }
*ptr++ = marker; *ptr++ = marker;
@ -137,7 +134,7 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
if (uses_superframe_syntax && s->n_cache > 0) { if (uses_superframe_syntax && s->n_cache > 0) {
av_log(ctx, AV_LOG_ERROR, av_log(ctx, AV_LOG_ERROR,
"Mixing of superframe syntax and naked VP9 frames not supported"); "Mixing of superframe syntax and naked VP9 frames not supported");
res = AVERROR_INVALIDDATA; res = AVERROR(ENOSYS);
goto done; goto done;
} else if ((!invisible || uses_superframe_syntax) && !s->n_cache) { } else if ((!invisible || uses_superframe_syntax) && !s->n_cache) {
// passthrough // passthrough
@ -150,33 +147,26 @@ static int vp9_superframe_filter(AVBSFContext *ctx, AVPacket *out)
goto done; goto done;
} }
s->cache[s->n_cache].size = in->size; s->cache[s->n_cache++] = in;
if (invisible && !uses_superframe_syntax) { in = NULL;
s->cache[s->n_cache].data = av_malloc(in->size); if (invisible) {
if (!s->cache[s->n_cache].data) {
res = AVERROR(ENOMEM);
goto done;
}
memcpy(s->cache[s->n_cache++].data, in->data, in->size);
res = AVERROR(EAGAIN); res = AVERROR(EAGAIN);
goto done; goto done;
} }
av_assert0(s->n_cache > 0); av_assert0(s->n_cache > 0);
s->cache[s->n_cache].data = in->data;
// build superframe // build superframe
if ((res = merge_superframe(s->cache, s->n_cache + 1, out)) < 0) if ((res = merge_superframe(s->cache, s->n_cache, out)) < 0)
goto done;
res = av_packet_copy_props(out, s->cache[s->n_cache - 1]);
if (res < 0)
goto done; goto done;
for (n = 0; n < s->n_cache; n++) for (n = 0; n < s->n_cache; n++)
av_freep(&s->cache[n].data); av_packet_free(&s->cache[n]);
s->n_cache = 0; s->n_cache = 0;
res = av_packet_copy_props(out, in);
if (res < 0)
goto done;
done: done:
if (res < 0) if (res < 0)
av_packet_unref(out); av_packet_unref(out);
@ -191,7 +181,7 @@ static void vp9_superframe_close(AVBSFContext *ctx)
// free cached data // free cached data
for (n = 0; n < s->n_cache; n++) for (n = 0; n < s->n_cache; n++)
av_freep(&s->cache[n].data); av_packet_free(&s->cache[n]);
} }
static const enum AVCodecID codec_ids[] = { static const enum AVCodecID codec_ids[] = {