static void ref_from_h264pic(H264Ref *dst, H264Picture *src)
{
- memcpy(dst->data, src->f.data, sizeof(dst->data));
- memcpy(dst->linesize, src->f.linesize, sizeof(dst->linesize));
+ memcpy(dst->data, src->f->data, sizeof(dst->data));
+ memcpy(dst->linesize, src->f->linesize, sizeof(dst->linesize));
dst->reference = src->reference;
dst->poc = src->poc;
dst->pic_id = src->pic_id;
if (lens[0] == lens[1] && lens[1] > 1) {
for (i = 0; i < lens[0] &&
- h->default_ref_list[0][i].parent->f.buf[0]->buffer ==
- h->default_ref_list[1][i].parent->f.buf[0]->buffer; i++);
+ h->default_ref_list[0][i].parent->f->buf[0]->buffer ==
+ h->default_ref_list[1][i].parent->f->buf[0]->buffer; i++);
if (i == lens[0]) {
FFSWAP(H264Ref, h->default_ref_list[1][0], h->default_ref_list[1][1]);
}
ff_tlog(h->avctx, "List0: %s fn:%d 0x%p\n",
(h->default_ref_list[0][i].long_ref ? "LT" : "ST"),
h->default_ref_list[0][i].pic_id,
- h->default_ref_list[0][i].f.data[0]);
+ h->default_ref_list[0][i].f->data[0]);
}
if (sl->slice_type_nos == AV_PICTURE_TYPE_B) {
for (i = 0; i < sl->ref_count[1]; i++) {
ff_tlog(h->avctx, "List1: %s fn:%d 0x%p\n",
(h->default_ref_list[1][i].long_ref ? "LT" : "ST"),
h->default_ref_list[1][i].pic_id,
- h->default_ref_list[1][i].f.data[0]);
+ h->default_ref_list[1][i].f->data[0]);
}
}
#endif
field[1] = field[0];
for (j = 0; j < 3; j++)
- field[1].data[j] += frame->parent->f.linesize[j];
+ field[1].data[j] += frame->parent->f->linesize[j];
field[1].reference = PICT_BOTTOM_FIELD;
field[1].poc = field[1].parent->field_poc[1];
for (i = 0; i < h->short_ref_count; i++) {
H264Picture *pic = h->short_ref[i];
av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n",
- i, pic->frame_num, pic->poc, pic->f.data[0]);
+ i, pic->frame_num, pic->poc, pic->f->data[0]);
}
}
}
H264Picture *pic = h->long_ref[i];
if (pic) {
av_log(h->avctx, AV_LOG_DEBUG, "%"PRIu32" fn:%d poc:%d %p\n",
- i, pic->frame_num, pic->poc, pic->f.data[0]);
+ i, pic->frame_num, pic->poc, pic->f->data[0]);
}
}
}
if (h->short_ref[0] == h->cur_pic_ptr)
remove_short_at_index(h, 0);
+ /* make sure the current picture is not already assigned as a long ref */
+ if (h->cur_pic_ptr->long_ref) {
+ for (j = 0; j < FF_ARRAY_ELEMS(h->long_ref); j++) {
+ if (h->long_ref[j] == h->cur_pic_ptr)
+ remove_long(h, j, 0);
+ }
+ }
+
+
if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) {
remove_long(h, mmco[i].long_arg, 0);