diff options
Diffstat (limited to 'libavcodec/h264_refs.c')
-rw-r--r-- | libavcodec/h264_refs.c | 150 |
1 files changed, 121 insertions, 29 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 9536c4b..976044c 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -2,20 +2,20 @@ * H.26L/H.264/AVC/JVT/14496-10/... reference picture handling * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -27,11 +27,12 @@ #include <inttypes.h> -#include "golomb_legacy.h" +#include "libavutil/avassert.h" #include "internal.h" #include "avcodec.h" #include "h264.h" #include "h264dec.h" +#include "golomb.h" #include "mpegutils.h" #include <assert.h> @@ -80,16 +81,18 @@ static int build_def_list(H264Ref *def, int def_len, int i[2] = { 0 }; int index = 0; - while ((i[0] < len || i[1] < len) && index < def_len) { + while (i[0] < len || i[1] < len) { while (i[0] < len && !(in[i[0]] && (in[i[0]]->reference & sel))) i[0]++; while (i[1] < len && !(in[i[1]] && (in[i[1]]->reference & (sel ^ 3)))) i[1]++; - if (i[0] < len && index < def_len) { + if (i[0] < len) { + av_assert0(index < def_len); in[i[0]]->pic_id = is_long ? i[0] : in[i[0]]->frame_num; split_field_copy(&def[index++], in[i[0]++], sel, 1); } - if (i[1] < len && index < def_len) { + if (i[1] < len) { + av_assert0(index < def_len); in[i[1]]->pic_id = is_long ? i[1] : in[i[1]]->frame_num; split_field_copy(&def[index++], in[i[1]++], sel ^ 3, 0); } @@ -121,9 +124,18 @@ static int add_sorted(H264Picture **sorted, H264Picture * const *src, return out_i; } -static void h264_initialise_ref_list(const H264Context *h, H264SliceContext *sl) +static int mismatches_ref(const H264Context *h, const H264Picture *pic) +{ + const AVFrame *f = pic->f; + return (h->cur_pic_ptr->f->width != f->width || + h->cur_pic_ptr->f->height != f->height || + h->cur_pic_ptr->f->format != f->format); +} + +static void h264_initialise_ref_list(H264Context *h, H264SliceContext *sl) { int i, len; + int j; if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { H264Picture *sorted[32]; @@ -138,13 +150,14 @@ static void h264_initialise_ref_list(const H264Context *h, H264SliceContext *sl) for (list = 0; list < 2; list++) { len = add_sorted(sorted, h->short_ref, h->short_ref_count, cur_poc, 1 ^ list); len += add_sorted(sorted + len, h->short_ref, h->short_ref_count, cur_poc, 0 ^ list); - assert(len <= 32); + av_assert0(len <= 32); len = build_def_list(sl->ref_list[list], FF_ARRAY_ELEMS(sl->ref_list[0]), sorted, len, 0, h->picture_structure); len += build_def_list(sl->ref_list[list] + len, FF_ARRAY_ELEMS(sl->ref_list[0]) - len, h->long_ref, 16, 1, h->picture_structure); + av_assert0(len <= 32); if (len < sl->ref_count[list]) memset(&sl->ref_list[list][len], 0, sizeof(H264Ref) * (sl->ref_count[list] - len)); @@ -165,10 +178,40 @@ static void h264_initialise_ref_list(const H264Context *h, H264SliceContext *sl) len += build_def_list(sl->ref_list[0] + len, FF_ARRAY_ELEMS(sl->ref_list[0]) - len, h-> long_ref, 16, 1, h->picture_structure); + av_assert0(len <= 32); if (len < sl->ref_count[0]) memset(&sl->ref_list[0][len], 0, sizeof(H264Ref) * (sl->ref_count[0] - len)); } +#ifdef TRACE + for (i = 0; i < sl->ref_count[0]; i++) { + ff_tlog(h->avctx, "List0: %s fn:%d 0x%p\n", + (sl->ref_list[0][i].parent ? (sl->ref_list[0][i].parent->long_ref ? "LT" : "ST") : "??"), + sl->ref_list[0][i].pic_id, + sl->ref_list[0][i].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", + (sl->ref_list[1][i].parent ? (sl->ref_list[1][i].parent->long_ref ? "LT" : "ST") : "??"), + sl->ref_list[1][i].pic_id, + sl->ref_list[1][i].data[0]); + } + } +#endif + + for (j = 0; j<1+(sl->slice_type_nos == AV_PICTURE_TYPE_B); j++) { + for (i = 0; i < sl->ref_count[j]; i++) { + if (sl->ref_list[j][i].parent) { + if (mismatches_ref(h, sl->ref_list[j][i].parent)) { + av_log(h->avctx, AV_LOG_ERROR, "Discarding mismatching reference\n"); + memset(&sl->ref_list[j][i], 0, sizeof(sl->ref_list[j][i])); + } + } + } + } + for (i = 0; i < sl->list_count; i++) + h->default_ref[i] = sl->ref_list[i][0]; } /** @@ -253,7 +296,7 @@ static void h264_fill_mbaff_ref_list(H264SliceContext *sl) } } -int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) +int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl) { int list, index, pic_structure; @@ -310,7 +353,7 @@ int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) long_idx = pic_num_extract(h, pic_id, &pic_structure); - if (long_idx > 31) { + if (long_idx > 31U) { av_log(h->avctx, AV_LOG_ERROR, "long_term_pic_idx overflow\n"); return AVERROR_INVALIDDATA; @@ -326,6 +369,8 @@ int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) } break; } + default: + av_assert0(0); } if (i < 0) { @@ -351,13 +396,19 @@ int ff_h264_build_ref_list(const H264Context *h, H264SliceContext *sl) } for (list = 0; list < sl->list_count; list++) { for (index = 0; index < sl->ref_count[list]; index++) { - if (!sl->ref_list[list][index].parent) { - av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture\n"); - if (index == 0 || h->avctx->err_recognition & AV_EF_EXPLODE) - return AVERROR_INVALIDDATA; + if ( !sl->ref_list[list][index].parent + || (!FIELD_PICTURE(h) && (sl->ref_list[list][index].reference&3) != 3)) { + int i; + av_log(h->avctx, AV_LOG_ERROR, "Missing reference picture, default is %d\n", h->default_ref[list].poc); + for (i = 0; i < FF_ARRAY_ELEMS(h->last_pocs); i++) + h->last_pocs[i] = INT_MIN; + if (h->default_ref[list].parent + && !(!FIELD_PICTURE(h) && (h->default_ref[list].reference&3) != 3)) + sl->ref_list[list][index] = h->default_ref[list]; else - sl->ref_list[list][index] = sl->ref_list[list][index - 1]; + return -1; } + av_assert0(av_buffer_get_ref_count(sl->ref_list[list][index].parent->f->buf[0]) > 0); } } @@ -393,7 +444,7 @@ int ff_h264_decode_ref_pic_list_reordering(H264SliceContext *sl, void *logctx) op); return AVERROR_INVALIDDATA; } - sl->ref_modifications[list][index].val = get_ue_golomb(&sl->gb); + sl->ref_modifications[list][index].val = get_ue_golomb_long(&sl->gb); sl->ref_modifications[list][index].op = op; sl->nb_ref_modifications[list]++; } @@ -518,11 +569,18 @@ void ff_h264_remove_all_refs(H264Context *h) } assert(h->long_ref_count == 0); + if (h->short_ref_count && !h->last_pic_for_ec.f->data[0]) { + ff_h264_unref_picture(h, &h->last_pic_for_ec); + ff_h264_ref_picture(h, &h->last_pic_for_ec, h->short_ref[0]); + } + for (i = 0; i < h->short_ref_count; i++) { unreference_pic(h, h->short_ref[i], 0); h->short_ref[i] = NULL; } h->short_ref_count = 0; + + memset(h->default_ref, 0, sizeof(h->default_ref)); } static void generate_sliding_window_mmcos(H264Context *h) @@ -530,10 +588,8 @@ static void generate_sliding_window_mmcos(H264Context *h) MMCO *mmco = h->mmco; int nb_mmco = 0; - assert(h->long_ref_count + h->short_ref_count <= h->ps.sps->ref_frame_count); - if (h->short_ref_count && - h->long_ref_count + h->short_ref_count == h->ps.sps->ref_frame_count && + h->long_ref_count + h->short_ref_count >= h->ps.sps->ref_frame_count && !(FIELD_PICTURE(h) && !h->first_field && h->cur_pic_ptr->reference)) { mmco[0].opcode = MMCO_SHORT2UNUSED; mmco[0].short_pic_num = h->short_ref[h->short_ref_count - 1]->frame_num; @@ -554,6 +610,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) MMCO *mmco = h->mmco; int mmco_count; int i, av_uninit(j); + int pps_ref_count[2] = {0}; int current_ref_assigned = 0, err = 0; H264Picture *av_uninit(pic); @@ -584,7 +641,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) if (mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg] || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) { - av_log(h->avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); + av_log(h->avctx, h->short_ref_count ? AV_LOG_ERROR : AV_LOG_DEBUG, "mmco: unref short failure\n"); err = AVERROR_INVALIDDATA; } continue; @@ -625,19 +682,24 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) * Report the problem and keep the pair where it is, * and mark this field valid. */ - if (h->short_ref[0] == h->cur_pic_ptr) + if (h->short_ref[0] == h->cur_pic_ptr) { + av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to short and long at the same time\n"); 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) + if (h->long_ref[j] == h->cur_pic_ptr) { + if (j != mmco[i].long_arg) + av_log(h->avctx, AV_LOG_ERROR, "mmco: cannot assign current picture to 2 long term references\n"); remove_long(h, j, 0); + } } } - if (h->long_ref[mmco[i].long_arg] != h->cur_pic_ptr) { + av_assert0(!h->cur_pic_ptr->long_ref); remove_long(h, mmco[i].long_arg, 0); h->long_ref[mmco[i].long_arg] = h->cur_pic_ptr; @@ -665,6 +727,8 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) h->poc.frame_num = h->cur_pic_ptr->frame_num = 0; h->mmco_reset = 1; h->cur_pic_ptr->mmco_reset = 1; + for (j = 0; j < MAX_DELAYED_PIC_COUNT; j++) + h->last_pocs[j] = INT_MIN; break; default: assert(0); } @@ -679,7 +743,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) */ if (h->short_ref_count && h->short_ref[0] == h->cur_pic_ptr) { /* Just mark the second field valid */ - h->cur_pic_ptr->reference = PICT_FRAME; + h->cur_pic_ptr->reference |= h->picture_structure; } else if (h->cur_pic_ptr->long_ref) { av_log(h->avctx, AV_LOG_ERROR, "illegal short term reference " "assignment for second field " @@ -703,8 +767,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) } } - if (h->long_ref_count + h->short_ref_count - - (h->short_ref[0] == h->cur_pic_ptr) > h->ps.sps->ref_frame_count) { + if (h->long_ref_count + h->short_ref_count > FFMAX(h->ps.sps->ref_frame_count, 1)) { /* We have too many reference frames, probably due to corrupted * stream. Need to discard one frame. Prevents overrun of the @@ -729,8 +792,37 @@ int ff_h264_execute_ref_pic_marking(H264Context *h) } } + for (i = 0; i<h->short_ref_count; i++) { + pic = h->short_ref[i]; + if (pic->invalid_gap) { + int d = av_mod_uintp2(h->cur_pic_ptr->frame_num - pic->frame_num, h->ps.sps->log2_max_frame_num); + if (d > h->ps.sps->ref_frame_count) + remove_short(h, pic->frame_num, 0); + } + } + print_short_term(h); print_long_term(h); + + for (i = 0; i < FF_ARRAY_ELEMS(h->ps.pps_list); i++) { + if (h->ps.pps_list[i]) { + const PPS *pps = (const PPS *)h->ps.pps_list[i]->data; + pps_ref_count[0] = FFMAX(pps_ref_count[0], pps->ref_count[0]); + pps_ref_count[1] = FFMAX(pps_ref_count[1], pps->ref_count[1]); + } + } + + if ( err >= 0 + && h->long_ref_count==0 + && ( h->short_ref_count<=2 + || pps_ref_count[0] <= 1 + (h->picture_structure != PICT_FRAME) && pps_ref_count[1] <= 1) + && pps_ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point) + && h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){ + h->cur_pic_ptr->recovered |= 1; + if(!h->avctx->has_b_frames) + h->frame_recovered |= FRAME_RECOVERED_SEI; + } + out: return (h->avctx->err_recognition & AV_EF_EXPLODE) ? err : 0; } @@ -759,7 +851,7 @@ int ff_h264_decode_ref_pic_marking(H264SliceContext *sl, GetBitContext *gb, mmco[i].opcode = opcode; if (opcode == MMCO_SHORT2UNUSED || opcode == MMCO_SHORT2LONG) { mmco[i].short_pic_num = - (sl->curr_pic_num - get_ue_golomb(gb) - 1) & + (sl->curr_pic_num - get_ue_golomb_long(gb) - 1) & (sl->max_pic_num - 1); } if (opcode == MMCO_SHORT2LONG || opcode == MMCO_LONG2UNUSED || |