generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: drop needs_realloc

Browse Source 
It is not needed anymore since switching to refcounted frames.
This commit is contained in:
Anton Khirnov 2015-03-31 10:10:42 +02:00
parent 0ac8ff618c
commit 27b0e6ebfd
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264.c
View File

@ -359,9 +359,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
ff_h264_unref_picture(h, &h->DPB[i]);
av_freep(&h->DPB);
} else if (h->DPB) {
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
h->DPB[i].needs_realloc = 1;
}
h->cur_pic_ptr = NULL;

1
libavcodec/h264.h
View File

@ -292,7 +292,6 @@ typedef struct H264Picture {
int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF
int field_picture; ///< whether or not picture was encoded in separate fields
int needs_realloc; ///< picture needs to be reallocated (eg due to a frame size change)
int reference;
int recovered; ///< picture at IDR or recovery point + recovery count
} H264Picture;

1
libavcodec/h264_picture.c
View File

@ -113,7 +113,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src)
dst->long_ref = src->long_ref;
dst->mbaff = src->mbaff;
dst->field_picture = src->field_picture;
dst->needs_realloc = src->needs_realloc;
dst->reference = src->reference;
dst->recovered = src->recovered;

7
libavcodec/h264_slice.c
View File

@ -273,8 +273,6 @@ static inline int pic_is_unused(H264Context *h, H264Picture *pic)
{
if (!pic->f.buf[0])
return 1;
if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
return 1;
return 0;
}
@ -289,11 +287,6 @@ static int find_unused_picture(H264Context *h)
if (i == H264_MAX_PICTURE_COUNT)
return AVERROR_INVALIDDATA;
if (h->DPB[i].needs_realloc) {
h->DPB[i].needs_realloc = 0;
ff_h264_unref_picture(h, &h->DPB[i]);
}
return i;
}