virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

h264: set Picture.owner2 to the current thread

Browse Source 
This does not seem to have an effect currently. Fate-h264 passes with
THREADS=1..16 and both threading types as before. It fixes however a
segfault during error resilience with my adaptive-frame-mt patchset.
A picture in use during error resilience gets realloced in another
thread in the fuzzed sample sample_varPAR.avi_s226019.
This commit is contained in:
Janne Grunau 2012-11-25 19:42:16 +01:00
parent 6e5cdf2628
commit d5e83122bd
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -2876,10 +2876,12 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
if (h->slice_type_nos != AV_PICTURE_TYPE_I) { if (h->slice_type_nos != AV_PICTURE_TYPE_I) {
s->last_picture_ptr = &h->ref_list[0][0]; s->last_picture_ptr = &h->ref_list[0][0];
s->last_picture_ptr->owner2 = s;
ff_copy_picture(&s->last_picture, s->last_picture_ptr); ff_copy_picture(&s->last_picture, s->last_picture_ptr);
} }
if (h->slice_type_nos == AV_PICTURE_TYPE_B) { if (h->slice_type_nos == AV_PICTURE_TYPE_B) {
s->next_picture_ptr = &h->ref_list[1][0]; s->next_picture_ptr = &h->ref_list[1][0];
s->next_picture_ptr->owner2 = s;
ff_copy_picture(&s->next_picture, s->next_picture_ptr); ff_copy_picture(&s->next_picture, s->next_picture_ptr);
} }

3
libavcodec/mpegvideo.c
View File

@ -1459,8 +1459,7 @@ int ff_MPV_frame_start(MpegEncContext *s, AVCodecContext *avctx)
if (s->next_picture_ptr) if (s->next_picture_ptr)
ff_copy_picture(&s->next_picture, s->next_picture_ptr); ff_copy_picture(&s->next_picture, s->next_picture_ptr);
if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME) && if (HAVE_THREADS && (avctx->active_thread_type & FF_THREAD_FRAME)) {
(s->out_format != FMT_H264 || s->codec_id == AV_CODEC_ID_SVQ3)) {
if (s->next_picture_ptr) if (s->next_picture_ptr)
s->next_picture_ptr->owner2 = s; s->next_picture_ptr->owner2 = s;
if (s->last_picture_ptr) if (s->last_picture_ptr)