virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-16 22:42:38 +02:00
Code Issues Releases Activity

avcodec/vp9: use a buffer pool to allocate VP9Frame extradata

Browse Source 
Reviewed-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2020-03-05 00:39:12 -03:00
parent 840e92da17
commit e4dd8ee323
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vp9.c
View File

@ -112,10 +112,20 @@ static int vp9_frame_alloc(AVCodecContext *avctx, VP9Frame *f)
return ret; return ret;
sz = 64 * s->sb_cols * s->sb_rows; sz = 64 * s->sb_cols * s->sb_rows;
f->extradata = av_buffer_allocz(sz * (1 + sizeof(VP9mvrefPair))); if (sz != s->frame_extradata_pool_size) {
av_buffer_pool_uninit(&s->frame_extradata_pool);
s->frame_extradata_pool = av_buffer_pool_init(sz * (1 + sizeof(VP9mvrefPair)), NULL);
if (!s->frame_extradata_pool) {
s->frame_extradata_pool_size = 0;
goto fail;
}
s->frame_extradata_pool_size = sz;
}
f->extradata = av_buffer_pool_get(s->frame_extradata_pool);
if (!f->extradata) { if (!f->extradata) {
goto fail; goto fail;
} }
memset(f->extradata->data, 0, f->extradata->size);
f->segmentation_map = f->extradata->data; f->segmentation_map = f->extradata->data;
f->mv = (VP9mvrefPair *) (f->extradata->data + sz); f->mv = (VP9mvrefPair *) (f->extradata->data + sz);
@ -1210,6 +1220,7 @@ static av_cold int vp9_decode_free(AVCodecContext *avctx)
vp9_frame_unref(avctx, &s->s.frames[i]); vp9_frame_unref(avctx, &s->s.frames[i]);
av_frame_free(&s->s.frames[i].tf.f); av_frame_free(&s->s.frames[i].tf.f);
} }
av_buffer_pool_uninit(&s->frame_extradata_pool);
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
if (s->s.refs[i].f->buf[0]) if (s->s.refs[i].f->buf[0])
ff_thread_release_buffer(avctx, &s->s.refs[i]); ff_thread_release_buffer(avctx, &s->s.refs[i]);

4
libavcodec/vp9dec.h
View File

@ -152,6 +152,10 @@ typedef struct VP9Context {
int block_alloc_using_2pass; int block_alloc_using_2pass;
uint16_t mvscale[3][2]; uint16_t mvscale[3][2];
uint8_t mvstep[3][2]; uint8_t mvstep[3][2];
// frame specific buffer pools
AVBufferPool *frame_extradata_pool;
int frame_extradata_pool_size;
} VP9Context; } VP9Context;
struct VP9TileData { struct VP9TileData {