mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-09-20 05:16:38 +00:00
h264: drop needs_realloc
It is not needed anymore since switching to refcounted frames.
This commit is contained in:
parent
0ac8ff618c
commit
27b0e6ebfd
@ -359,9 +359,6 @@ void ff_h264_free_tables(H264Context *h, int free_rbsp)
|
|||||||
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);
|
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;
|
h->cur_pic_ptr = NULL;
|
||||||
|
@ -292,7 +292,6 @@ typedef struct H264Picture {
|
|||||||
int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF
|
int mbaff; ///< 1 -> MBAFF frame 0-> not MBAFF
|
||||||
int field_picture; ///< whether or not picture was encoded in separate fields
|
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 reference;
|
||||||
int recovered; ///< picture at IDR or recovery point + recovery count
|
int recovered; ///< picture at IDR or recovery point + recovery count
|
||||||
} H264Picture;
|
} H264Picture;
|
||||||
|
@ -113,7 +113,6 @@ int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src)
|
|||||||
dst->long_ref = src->long_ref;
|
dst->long_ref = src->long_ref;
|
||||||
dst->mbaff = src->mbaff;
|
dst->mbaff = src->mbaff;
|
||||||
dst->field_picture = src->field_picture;
|
dst->field_picture = src->field_picture;
|
||||||
dst->needs_realloc = src->needs_realloc;
|
|
||||||
dst->reference = src->reference;
|
dst->reference = src->reference;
|
||||||
dst->recovered = src->recovered;
|
dst->recovered = src->recovered;
|
||||||
|
|
||||||
|
@ -273,8 +273,6 @@ static inline int pic_is_unused(H264Context *h, H264Picture *pic)
|
|||||||
{
|
{
|
||||||
if (!pic->f.buf[0])
|
if (!pic->f.buf[0])
|
||||||
return 1;
|
return 1;
|
||||||
if (pic->needs_realloc && !(pic->reference & DELAYED_PIC_REF))
|
|
||||||
return 1;
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -289,11 +287,6 @@ static int find_unused_picture(H264Context *h)
|
|||||||
if (i == H264_MAX_PICTURE_COUNT)
|
if (i == H264_MAX_PICTURE_COUNT)
|
||||||
return AVERROR_INVALIDDATA;
|
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;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user