virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

h264: embed the DPB in the context

Browse Source 
It now has a fixed size and is initialized only once, so there is no
point in allocating it separately.
This commit is contained in:
Anton Khirnov
2015-04-12 21:08:34 +02:00
parent 88c612e3a4
commit 7a4f74eed5
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/h264.c
View File

@@ -590,9 +590,6 @@ static int h264_init_context(AVCodecContext *avctx, H264Context *h)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
h->DPB = av_mallocz_array(H264_MAX_PICTURE_COUNT, sizeof(*h->DPB));
if (!h->DPB)
return AVERROR(ENOMEM);
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
av_frame_unref(&h->DPB[i].f); av_frame_unref(&h->DPB[i].f);
av_frame_unref(&h->cur_pic.f); av_frame_unref(&h->cur_pic.f);
@@ -1052,9 +1049,8 @@ static void flush_dpb(AVCodecContext *avctx)
ff_h264_flush_change(h); ff_h264_flush_change(h);
if (h->DPB) for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) ff_h264_unref_picture(h, &h->DPB[i]);
ff_h264_unref_picture(h, &h->DPB[i]);
h->cur_pic_ptr = NULL; h->cur_pic_ptr = NULL;
ff_h264_unref_picture(h, &h->cur_pic); ff_h264_unref_picture(h, &h->cur_pic);
@@ -1698,11 +1694,8 @@ av_cold void ff_h264_free_context(H264Context *h)
ff_h264_free_tables(h); ff_h264_free_tables(h);
if (h->DPB) { for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) ff_h264_unref_picture(h, &h->DPB[i]);
ff_h264_unref_picture(h, &h->DPB[i]);
av_freep(&h->DPB);
}
h->cur_pic_ptr = NULL; h->cur_pic_ptr = NULL;

2
libavcodec/h264.h
View File

@@ -468,7 +468,7 @@ typedef struct H264Context {
H264QpelContext h264qpel; H264QpelContext h264qpel;
GetBitContext gb; GetBitContext gb;
H264Picture *DPB; H264Picture DPB[H264_MAX_PICTURE_COUNT];
H264Picture *cur_pic_ptr; H264Picture *cur_pic_ptr;
H264Picture cur_pic; H264Picture cur_pic;