X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fh264_slice.c;h=c43a0beca09efad77ae289a5ca6e1fe6bb2084e7;hb=8d36932c8d33f93ce1afdd5c1f402e7b6655d5ae;hp=1251ff576f40dfe25e28d0d460f1c593eacece37;hpb=89ae244e78a8d636fbb8427a2da052b04cf710bd;p=ffmpeg diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 1251ff576f4..c43a0beca09 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -21,7 +21,7 @@ /** * @file - * H.264 / AVC / MPEG4 part10 codec. + * H.264 / AVC / MPEG-4 part10 codec. * @author Michael Niedermayer */ @@ -128,7 +128,7 @@ static int alloc_scratch_buffers(H264SliceContext *sl, int linesize) av_fast_malloc(&sl->bipred_scratchpad, &sl->bipred_scratchpad_allocated, 16 * 6 * alloc_size); // edge emu needs blocksize + filter length - 1 - // (= 21x21 for h264) + // (= 21x21 for H.264) av_fast_malloc(&sl->edge_emu_buffer, &sl->edge_emu_buffer_allocated, alloc_size * 2 * 21); av_fast_malloc(&sl->top_borders[0], &sl->top_borders_allocated[0], @@ -378,7 +378,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->first_field = h1->first_field; h->picture_structure = h1->picture_structure; h->droppable = h1->droppable; - h->low_delay = h1->low_delay; for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) { ff_h264_unref_picture(h, &h->DPB[i]); @@ -397,7 +396,6 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->enable_er = h1->enable_er; h->workaround_bugs = h1->workaround_bugs; - h->low_delay = h1->low_delay; h->droppable = h1->droppable; // extradata/NAL handling @@ -418,8 +416,9 @@ int ff_h264_update_thread_context(AVCodecContext *dst, h->next_outputed_poc = h1->next_outputed_poc; memcpy(h->mmco, h1->mmco, sizeof(h->mmco)); - h->mmco_index = h1->mmco_index; + h->nb_mmco = h1->nb_mmco; h->mmco_reset = h1->mmco_reset; + h->explicit_ref_marking = h1->explicit_ref_marking; h->long_ref_count = h1->long_ref_count; h->short_ref_count = h1->short_ref_count; @@ -432,7 +431,7 @@ int ff_h264_update_thread_context(AVCodecContext *dst, return 0; if (!h->droppable) { - err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); + err = ff_h264_execute_ref_pic_marking(h); h->poc.prev_poc_msb = h->poc.poc_msb; h->poc.prev_poc_lsb = h->poc.poc_lsb; } @@ -469,6 +468,8 @@ static int h264_frame_start(H264Context *h) pic->mmco_reset = 0; pic->recovered = 0; + pic->f->pict_type = h->slice_ctx[0].slice_type; + if (CONFIG_ERROR_RESILIENCE && h->enable_er) ff_er_frame_start(&h->slice_ctx[0].er); @@ -498,6 +499,8 @@ static int h264_frame_start(H264Context *h) h->next_output_pic = NULL; + h->postpone_filter = 0; + assert(h->cur_pic_ptr->long_ref == 0); return 0; @@ -827,9 +830,6 @@ static int init_dimensions(H264Context *h) static int h264_slice_header_init(H264Context *h) { const SPS *sps = h->ps.sps; - int nb_slices = (HAVE_THREADS && - h->avctx->active_thread_type & FF_THREAD_SLICE) ? - h->avctx->thread_count : 1; int i, ret; ff_set_sar(h->avctx, sps->sar); @@ -875,18 +875,6 @@ static int h264_slice_header_init(H264Context *h) sps->chroma_format_idc); ff_videodsp_init(&h->vdsp, sps->bit_depth_luma); - if (nb_slices > H264_MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) { - int max_slices; - if (h->mb_height) - max_slices = FFMIN(H264_MAX_THREADS, h->mb_height); - else - max_slices = H264_MAX_THREADS; - av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices %d," - " reducing to %d\n", nb_slices, max_slices); - nb_slices = max_slices; - } - h->slice_context_count = nb_slices; - if (!HAVE_THREADS || !(h->avctx->active_thread_type & FF_THREAD_SLICE)) { ret = ff_h264_slice_context_init(h, &h->slice_ctx[0]); if (ret < 0) { @@ -894,7 +882,7 @@ static int h264_slice_header_init(H264Context *h) return ret; } } else { - for (i = 0; i < h->slice_context_count; i++) { + for (i = 0; i < h->nb_slice_ctx; i++) { H264SliceContext *sl = &h->slice_ctx[i]; sl->h264 = h; @@ -914,164 +902,58 @@ static int h264_slice_header_init(H264Context *h) return 0; } -/** - * Decode a slice header. - * This will (re)intialize the decoder and call h264_frame_start() as needed. - * - * @param h h264context - * - * @return 0 if okay, <0 if an error occurred, 1 if decoding must not be multithreaded - */ -int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) +static int h264_init_ps(H264Context *h, const H264SliceContext *sl) { const SPS *sps; - const PPS *pps; - unsigned int first_mb_in_slice; - unsigned int pps_id; - int ret; - unsigned int slice_type, tmp, i, j; - int last_pic_structure, last_pic_droppable; - int needs_reinit = 0; - int field_pic_flag, bottom_field_flag; - int frame_num, droppable, picture_structure; - int mb_aff_frame = 0; - - h->qpel_put = h->h264qpel.put_h264_qpel_pixels_tab; - h->qpel_avg = h->h264qpel.avg_h264_qpel_pixels_tab; - - first_mb_in_slice = get_ue_golomb(&sl->gb); - - if (first_mb_in_slice == 0) { // FIXME better field boundary detection - if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { - ff_h264_field_end(h, sl, 1); - } - - h->current_slice = 0; - if (!h->first_field) { - if (h->cur_pic_ptr && !h->droppable) { - ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, - h->picture_structure == PICT_BOTTOM_FIELD); - } - h->cur_pic_ptr = NULL; - } - } - - slice_type = get_ue_golomb_31(&sl->gb); - if (slice_type > 9) { - av_log(h->avctx, AV_LOG_ERROR, - "slice type %d too large at %d\n", - slice_type, first_mb_in_slice); - return AVERROR_INVALIDDATA; - } - if (slice_type > 4) { - slice_type -= 5; - sl->slice_type_fixed = 1; - } else - sl->slice_type_fixed = 0; - - slice_type = ff_h264_golomb_to_pict_type[slice_type]; - sl->slice_type = slice_type; - sl->slice_type_nos = slice_type & 3; - - if (h->nal_unit_type == NAL_IDR_SLICE && - sl->slice_type_nos != AV_PICTURE_TYPE_I) { - av_log(h->avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n"); - return AVERROR_INVALIDDATA; - } - - // to make a few old functions happy, it's wrong though - if (!h->setup_finished) - h->pict_type = sl->slice_type; - - pps_id = get_ue_golomb(&sl->gb); - if (pps_id >= MAX_PPS_COUNT) { - av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", pps_id); - return AVERROR_INVALIDDATA; - } - if (!h->ps.pps_list[pps_id]) { - av_log(h->avctx, AV_LOG_ERROR, - "non-existing PPS %u referenced\n", - pps_id); - return AVERROR_INVALIDDATA; - } - if (!h->setup_finished) { - h->ps.pps = (const PPS*)h->ps.pps_list[pps_id]->data; - } else if (h->ps.pps != (const PPS*)h->ps.pps_list[pps_id]->data) { - av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n"); - return AVERROR_INVALIDDATA; - } - - if (!h->ps.sps_list[h->ps.pps->sps_id]) { - av_log(h->avctx, AV_LOG_ERROR, - "non-existing SPS %u referenced\n", - h->ps.pps->sps_id); - return AVERROR_INVALIDDATA; - } + int needs_reinit = 0, ret; + h->ps.pps = (const PPS*)h->ps.pps_list[sl->pps_id]->data; if (h->ps.sps != (const SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data) { h->ps.sps = (SPS*)h->ps.sps_list[h->ps.pps->sps_id]->data; if (h->bit_depth_luma != h->ps.sps->bit_depth_luma || h->chroma_format_idc != h->ps.sps->chroma_format_idc) needs_reinit = 1; - - if (h->flags & AV_CODEC_FLAG_LOW_DELAY || - (h->ps.sps->bitstream_restriction_flag && - !h->ps.sps->num_reorder_frames)) { - if (h->avctx->has_b_frames > 1 || h->delayed_pic[0]) - av_log(h->avctx, AV_LOG_WARNING, "Delayed frames seen. " - "Reenabling low delay requires a codec flush.\n"); - else - h->low_delay = 1; - } - - if (h->avctx->has_b_frames < 2) - h->avctx->has_b_frames = !h->low_delay; - } - - pps = h->ps.pps; sps = h->ps.sps; - if (!h->setup_finished) { - h->avctx->profile = ff_h264_get_profile(sps); - h->avctx->level = sps->level_idc; - h->avctx->refs = sps->ref_frame_count; + h->avctx->profile = ff_h264_get_profile(sps); + h->avctx->level = sps->level_idc; + h->avctx->refs = sps->ref_frame_count; - if (h->mb_width != sps->mb_width || - h->mb_height != sps->mb_height * (2 - sps->frame_mbs_only_flag)) - needs_reinit = 1; + if (h->mb_width != sps->mb_width || + h->mb_height != sps->mb_height * (2 - sps->frame_mbs_only_flag)) + needs_reinit = 1; - h->mb_width = sps->mb_width; - h->mb_height = sps->mb_height * (2 - sps->frame_mbs_only_flag); - h->mb_num = h->mb_width * h->mb_height; - h->mb_stride = h->mb_width + 1; + h->mb_width = sps->mb_width; + h->mb_height = sps->mb_height * (2 - sps->frame_mbs_only_flag); + h->mb_num = h->mb_width * h->mb_height; + h->mb_stride = h->mb_width + 1; - h->b_stride = h->mb_width * 4; + h->b_stride = h->mb_width * 4; - h->chroma_y_shift = sps->chroma_format_idc <= 1; // 400 uses yuv420p + h->chroma_y_shift = sps->chroma_format_idc <= 1; // 400 uses yuv420p - h->width = 16 * h->mb_width; - h->height = 16 * h->mb_height; + h->width = 16 * h->mb_width; + h->height = 16 * h->mb_height; - ret = init_dimensions(h); - if (ret < 0) - return ret; + ret = init_dimensions(h); + if (ret < 0) + return ret; - if (sps->video_signal_type_present_flag) { - h->avctx->color_range = sps->full_range ? AVCOL_RANGE_JPEG - : AVCOL_RANGE_MPEG; - if (sps->colour_description_present_flag) { - if (h->avctx->colorspace != sps->colorspace) - needs_reinit = 1; - h->avctx->color_primaries = sps->color_primaries; - h->avctx->color_trc = sps->color_trc; - h->avctx->colorspace = sps->colorspace; - } + if (sps->video_signal_type_present_flag) { + h->avctx->color_range = sps->full_range ? AVCOL_RANGE_JPEG + : AVCOL_RANGE_MPEG; + if (sps->colour_description_present_flag) { + if (h->avctx->colorspace != sps->colorspace) + needs_reinit = 1; + h->avctx->color_primaries = sps->color_primaries; + h->avctx->color_trc = sps->color_trc; + h->avctx->colorspace = sps->colorspace; } } - if (h->context_initialized && needs_reinit) { + if (!h->context_initialized || needs_reinit) { h->context_initialized = 0; if (sl != h->slice_ctx) { av_log(h->avctx, AV_LOG_ERROR, @@ -1089,7 +971,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) return ret; h->avctx->pix_fmt = ret; - av_log(h->avctx, AV_LOG_INFO, "Reinit context to %dx%d, " + av_log(h->avctx, AV_LOG_VERBOSE, "Reinit context to %dx%d, " "pix_fmt: %d\n", h->width, h->height, h->avctx->pix_fmt); if ((ret = h264_slice_header_init(h)) < 0) { @@ -1098,238 +980,272 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) return ret; } } - if (!h->context_initialized) { - if (sl != h->slice_ctx) { - av_log(h->avctx, AV_LOG_ERROR, - "Cannot (re-)initialize context during parallel decoding.\n"); - return AVERROR_PATCHWELCOME; - } - if ((ret = get_pixel_format(h)) < 0) - return ret; - h->avctx->pix_fmt = ret; + return 0; +} - if ((ret = h264_slice_header_init(h)) < 0) { - av_log(h->avctx, AV_LOG_ERROR, - "h264_slice_header_init() failed\n"); - return ret; - } - } +/* This function is called right after decoding the slice header for a first + * slice in a field (or a frame). It decides whether we are decoding a new frame + * or a second field in a pair and does the necessary setup. + */ +static int h264_field_start(H264Context *h, const H264SliceContext *sl, + const H2645NAL *nal) +{ + const SPS *sps; - frame_num = get_bits(&sl->gb, sps->log2_max_frame_num); - if (!h->setup_finished) - h->poc.frame_num = frame_num; + int last_pic_structure, last_pic_droppable, ret; - sl->mb_mbaff = 0; + ret = h264_init_ps(h, sl); + if (ret < 0) + return ret; - last_pic_structure = h->picture_structure; - last_pic_droppable = h->droppable; + sps = h->ps.sps; - droppable = h->nal_ref_idc == 0; - if (sps->frame_mbs_only_flag) { - picture_structure = PICT_FRAME; - } else { - field_pic_flag = get_bits1(&sl->gb); - if (field_pic_flag) { - bottom_field_flag = get_bits1(&sl->gb); - picture_structure = PICT_TOP_FIELD + bottom_field_flag; - } else { - picture_structure = PICT_FRAME; - mb_aff_frame = sps->mb_aff; - } - } - if (!h->setup_finished) { - h->droppable = droppable; - h->picture_structure = picture_structure; - h->mb_aff_frame = mb_aff_frame; - } - sl->mb_field_decoding_flag = h->picture_structure != PICT_FRAME; + last_pic_droppable = h->droppable; + last_pic_structure = h->picture_structure; + h->droppable = (nal->ref_idc == 0); + h->picture_structure = sl->picture_structure; - if (h->current_slice != 0) { - if (last_pic_structure != picture_structure || - last_pic_droppable != droppable) { - av_log(h->avctx, AV_LOG_ERROR, - "Changing field mode (%d -> %d) between slices is not allowed\n", - last_pic_structure, h->picture_structure); - return AVERROR_INVALIDDATA; - } else if (!h->cur_pic_ptr) { - av_log(h->avctx, AV_LOG_ERROR, - "unset cur_pic_ptr on slice %d\n", - h->current_slice + 1); - return AVERROR_INVALIDDATA; - } - } else { - /* Shorten frame num gaps so we don't have to allocate reference - * frames just to throw them away */ - if (h->poc.frame_num != h->poc.prev_frame_num) { - int unwrap_prev_frame_num = h->poc.prev_frame_num; - int max_frame_num = 1 << sps->log2_max_frame_num; + /* Shorten frame num gaps so we don't have to allocate reference + * frames just to throw them away */ + if (h->poc.frame_num != h->poc.prev_frame_num) { + int unwrap_prev_frame_num = h->poc.prev_frame_num; + int max_frame_num = 1 << sps->log2_max_frame_num; - if (unwrap_prev_frame_num > h->poc.frame_num) - unwrap_prev_frame_num -= max_frame_num; + if (unwrap_prev_frame_num > h->poc.frame_num) + unwrap_prev_frame_num -= max_frame_num; - if ((h->poc.frame_num - unwrap_prev_frame_num) > sps->ref_frame_count) { - unwrap_prev_frame_num = (h->poc.frame_num - sps->ref_frame_count) - 1; - if (unwrap_prev_frame_num < 0) - unwrap_prev_frame_num += max_frame_num; + if ((h->poc.frame_num - unwrap_prev_frame_num) > sps->ref_frame_count) { + unwrap_prev_frame_num = (h->poc.frame_num - sps->ref_frame_count) - 1; + if (unwrap_prev_frame_num < 0) + unwrap_prev_frame_num += max_frame_num; - h->poc.prev_frame_num = unwrap_prev_frame_num; - } + h->poc.prev_frame_num = unwrap_prev_frame_num; } + } - /* See if we have a decoded first field looking for a pair... - * Here, we're using that to see if we should mark previously - * decode frames as "finished". - * We have to do that before the "dummy" in-between frame allocation, - * since that can modify s->current_picture_ptr. */ - if (h->first_field) { - assert(h->cur_pic_ptr); - assert(h->cur_pic_ptr->f->buf[0]); - assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); - - /* figure out if we have a complementary field pair */ - if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) { - /* Previous field is unmatched. Don't display it, but let it - * remain for reference if marked as such. */ + /* See if we have a decoded first field looking for a pair... + * Here, we're using that to see if we should mark previously + * decode frames as "finished". + * We have to do that before the "dummy" in-between frame allocation, + * since that can modify s->current_picture_ptr. */ + if (h->first_field) { + assert(h->cur_pic_ptr); + assert(h->cur_pic_ptr->f->buf[0]); + assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); + + /* figure out if we have a complementary field pair */ + if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) { + /* Previous field is unmatched. Don't display it, but let it + * remain for reference if marked as such. */ + if (!last_pic_droppable && last_pic_structure != PICT_FRAME) { + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, + last_pic_structure == PICT_TOP_FIELD); + } + } else { + if (h->cur_pic_ptr->frame_num != h->poc.frame_num) { + /* This and previous field were reference, but had + * different frame_nums. Consider this field first in + * pair. Throw away previous field except for reference + * purposes. */ if (!last_pic_droppable && last_pic_structure != PICT_FRAME) { ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, last_pic_structure == PICT_TOP_FIELD); } } else { - if (h->cur_pic_ptr->frame_num != h->poc.frame_num) { - /* This and previous field were reference, but had - * different frame_nums. Consider this field first in - * pair. Throw away previous field except for reference - * purposes. */ - if (!last_pic_droppable && last_pic_structure != PICT_FRAME) { - ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, - last_pic_structure == PICT_TOP_FIELD); - } - } else { - /* Second field in complementary pair */ - if (!((last_pic_structure == PICT_TOP_FIELD && - h->picture_structure == PICT_BOTTOM_FIELD) || - (last_pic_structure == PICT_BOTTOM_FIELD && - h->picture_structure == PICT_TOP_FIELD))) { - av_log(h->avctx, AV_LOG_ERROR, - "Invalid field mode combination %d/%d\n", - last_pic_structure, h->picture_structure); - h->picture_structure = last_pic_structure; - h->droppable = last_pic_droppable; - return AVERROR_INVALIDDATA; - } else if (last_pic_droppable != h->droppable) { - avpriv_request_sample(h->avctx, - "Found reference and non-reference fields in the same frame, which"); - h->picture_structure = last_pic_structure; - h->droppable = last_pic_droppable; - return AVERROR_PATCHWELCOME; - } + /* Second field in complementary pair */ + if (!((last_pic_structure == PICT_TOP_FIELD && + h->picture_structure == PICT_BOTTOM_FIELD) || + (last_pic_structure == PICT_BOTTOM_FIELD && + h->picture_structure == PICT_TOP_FIELD))) { + av_log(h->avctx, AV_LOG_ERROR, + "Invalid field mode combination %d/%d\n", + last_pic_structure, h->picture_structure); + h->picture_structure = last_pic_structure; + h->droppable = last_pic_droppable; + return AVERROR_INVALIDDATA; + } else if (last_pic_droppable != h->droppable) { + avpriv_request_sample(h->avctx, + "Found reference and non-reference fields in the same frame, which"); + h->picture_structure = last_pic_structure; + h->droppable = last_pic_droppable; + return AVERROR_PATCHWELCOME; } } } + } - while (h->poc.frame_num != h->poc.prev_frame_num && - h->poc.frame_num != (h->poc.prev_frame_num + 1) % (1 << sps->log2_max_frame_num)) { - H264Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; - av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", - h->poc.frame_num, h->poc.prev_frame_num); - ret = initialize_cur_frame(h); - if (ret < 0) { - h->first_field = 0; - return ret; - } + while (h->poc.frame_num != h->poc.prev_frame_num && + h->poc.frame_num != (h->poc.prev_frame_num + 1) % (1 << sps->log2_max_frame_num)) { + H264Picture *prev = h->short_ref_count ? h->short_ref[0] : NULL; + av_log(h->avctx, AV_LOG_DEBUG, "Frame num gap %d %d\n", + h->poc.frame_num, h->poc.prev_frame_num); + ret = initialize_cur_frame(h); + if (ret < 0) { + h->first_field = 0; + return ret; + } - h->poc.prev_frame_num++; - h->poc.prev_frame_num %= 1 << sps->log2_max_frame_num; - h->cur_pic_ptr->frame_num = h->poc.prev_frame_num; - ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0); - ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1); - ret = ff_generate_sliding_window_mmcos(h, 1); - if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) - return ret; - ret = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); - if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) - return ret; - /* Error concealment: If a ref is missing, copy the previous ref - * in its place. - * FIXME: Avoiding a memcpy would be nice, but ref handling makes - * many assumptions about there being no actual duplicates. - * FIXME: This does not copy padding for out-of-frame motion - * vectors. Given we are concealing a lost frame, this probably - * is not noticeable by comparison, but it should be fixed. */ - if (h->short_ref_count) { - if (prev && - h->short_ref[0]->f->width == prev->f->width && - h->short_ref[0]->f->height == prev->f->height && - h->short_ref[0]->f->format == prev->f->format) { - av_image_copy(h->short_ref[0]->f->data, - h->short_ref[0]->f->linesize, - (const uint8_t **)prev->f->data, - prev->f->linesize, - prev->f->format, - h->mb_width * 16, - h->mb_height * 16); - h->short_ref[0]->poc = prev->poc + 2; - } - h->short_ref[0]->frame_num = h->poc.prev_frame_num; + h->poc.prev_frame_num++; + h->poc.prev_frame_num %= 1 << sps->log2_max_frame_num; + h->cur_pic_ptr->frame_num = h->poc.prev_frame_num; + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 0); + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, 1); + + h->explicit_ref_marking = 0; + ret = ff_h264_execute_ref_pic_marking(h); + if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) + return ret; + /* Error concealment: If a ref is missing, copy the previous ref + * in its place. + * FIXME: Avoiding a memcpy would be nice, but ref handling makes + * many assumptions about there being no actual duplicates. + * FIXME: This does not copy padding for out-of-frame motion + * vectors. Given we are concealing a lost frame, this probably + * is not noticeable by comparison, but it should be fixed. */ + if (h->short_ref_count) { + if (prev && + h->short_ref[0]->f->width == prev->f->width && + h->short_ref[0]->f->height == prev->f->height && + h->short_ref[0]->f->format == prev->f->format) { + av_image_copy(h->short_ref[0]->f->data, + h->short_ref[0]->f->linesize, + (const uint8_t **)prev->f->data, + prev->f->linesize, + prev->f->format, + h->mb_width * 16, + h->mb_height * 16); + h->short_ref[0]->poc = prev->poc + 2; } + h->short_ref[0]->frame_num = h->poc.prev_frame_num; } + } - /* See if we have a decoded first field looking for a pair... - * We're using that to see whether to continue decoding in that - * frame, or to allocate a new one. */ - if (h->first_field) { - assert(h->cur_pic_ptr); - assert(h->cur_pic_ptr->f->buf[0]); - assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); - - /* figure out if we have a complementary field pair */ - if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) { - /* Previous field is unmatched. Don't display it, but let it - * remain for reference if marked as such. */ + /* See if we have a decoded first field looking for a pair... + * We're using that to see whether to continue decoding in that + * frame, or to allocate a new one. */ + if (h->first_field) { + assert(h->cur_pic_ptr); + assert(h->cur_pic_ptr->f->buf[0]); + assert(h->cur_pic_ptr->reference != DELAYED_PIC_REF); + + /* figure out if we have a complementary field pair */ + if (!FIELD_PICTURE(h) || h->picture_structure == last_pic_structure) { + /* Previous field is unmatched. Don't display it, but let it + * remain for reference if marked as such. */ + h->cur_pic_ptr = NULL; + h->first_field = FIELD_PICTURE(h); + } else { + if (h->cur_pic_ptr->frame_num != h->poc.frame_num) { + /* This and the previous field had different frame_nums. + * Consider this field first in pair. Throw away previous + * one except for reference purposes. */ + h->first_field = 1; h->cur_pic_ptr = NULL; - h->first_field = FIELD_PICTURE(h); } else { - if (h->cur_pic_ptr->frame_num != h->poc.frame_num) { - /* This and the previous field had different frame_nums. - * Consider this field first in pair. Throw away previous - * one except for reference purposes. */ - h->first_field = 1; - h->cur_pic_ptr = NULL; - } else { - /* Second field in complementary pair */ - h->first_field = 0; - } + /* Second field in complementary pair */ + h->first_field = 0; } - } else { - /* Frame or first field in a potentially complementary pair */ - h->first_field = FIELD_PICTURE(h); } + } else { + /* Frame or first field in a potentially complementary pair */ + h->first_field = FIELD_PICTURE(h); + } - if (!FIELD_PICTURE(h) || h->first_field) { - if (h264_frame_start(h) < 0) { - h->first_field = 0; - return AVERROR_INVALIDDATA; - } - } else { - release_unused_pictures(h, 0); + if (!FIELD_PICTURE(h) || h->first_field) { + if (h264_frame_start(h) < 0) { + h->first_field = 0; + return AVERROR_INVALIDDATA; } + } else { + release_unused_pictures(h, 0); } - assert(h->mb_num == h->mb_width * h->mb_height); - if (first_mb_in_slice << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || - first_mb_in_slice >= h->mb_num) { - av_log(h->avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n"); + return 0; +} + +static int h264_slice_header_parse(H264Context *h, H264SliceContext *sl, + const H2645NAL *nal) +{ + const SPS *sps; + const PPS *pps; + int ret; + unsigned int slice_type, tmp, i; + int field_pic_flag, bottom_field_flag; + int frame_num, droppable, picture_structure; + int mb_aff_frame = 0; + + sl->first_mb_addr = get_ue_golomb(&sl->gb); + + slice_type = get_ue_golomb_31(&sl->gb); + if (slice_type > 9) { + av_log(h->avctx, AV_LOG_ERROR, + "slice type %d too large at %d\n", + slice_type, sl->first_mb_addr); return AVERROR_INVALIDDATA; } - sl->resync_mb_x = sl->mb_x = first_mb_in_slice % h->mb_width; - sl->resync_mb_y = sl->mb_y = (first_mb_in_slice / h->mb_width) << - FIELD_OR_MBAFF_PICTURE(h); - if (h->picture_structure == PICT_BOTTOM_FIELD) - sl->resync_mb_y = sl->mb_y = sl->mb_y + 1; - assert(sl->mb_y < h->mb_height); + if (slice_type > 4) { + slice_type -= 5; + sl->slice_type_fixed = 1; + } else + sl->slice_type_fixed = 0; + + slice_type = ff_h264_golomb_to_pict_type[slice_type]; + sl->slice_type = slice_type; + sl->slice_type_nos = slice_type & 3; + + if (nal->type == NAL_IDR_SLICE && + sl->slice_type_nos != AV_PICTURE_TYPE_I) { + av_log(h->avctx, AV_LOG_ERROR, "A non-intra slice in an IDR NAL unit.\n"); + return AVERROR_INVALIDDATA; + } + + sl->pps_id = get_ue_golomb(&sl->gb); + if (sl->pps_id >= MAX_PPS_COUNT) { + av_log(h->avctx, AV_LOG_ERROR, "pps_id %u out of range\n", sl->pps_id); + return AVERROR_INVALIDDATA; + } + if (!h->ps.pps_list[sl->pps_id]) { + av_log(h->avctx, AV_LOG_ERROR, + "non-existing PPS %u referenced\n", + sl->pps_id); + return AVERROR_INVALIDDATA; + } + pps = (const PPS*)h->ps.pps_list[sl->pps_id]->data; + + if (!h->ps.sps_list[pps->sps_id]) { + av_log(h->avctx, AV_LOG_ERROR, + "non-existing SPS %u referenced\n", pps->sps_id); + return AVERROR_INVALIDDATA; + } + sps = (const SPS*)h->ps.sps_list[pps->sps_id]->data; + + frame_num = get_bits(&sl->gb, sps->log2_max_frame_num); + if (!h->setup_finished) + h->poc.frame_num = frame_num; + + sl->mb_mbaff = 0; + + droppable = nal->ref_idc == 0; + if (sps->frame_mbs_only_flag) { + picture_structure = PICT_FRAME; + } else { + field_pic_flag = get_bits1(&sl->gb); + if (field_pic_flag) { + bottom_field_flag = get_bits1(&sl->gb); + picture_structure = PICT_TOP_FIELD + bottom_field_flag; + } else { + picture_structure = PICT_FRAME; + mb_aff_frame = sps->mb_aff; + } + } + if (!h->setup_finished) { + h->mb_aff_frame = mb_aff_frame; + } + sl->picture_structure = picture_structure; + sl->mb_field_decoding_flag = picture_structure != PICT_FRAME; - if (h->picture_structure == PICT_FRAME) { + if (picture_structure == PICT_FRAME) { h->curr_pic_num = h->poc.frame_num; h->max_pic_num = 1 << sps->log2_max_frame_num; } else { @@ -1337,7 +1253,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) h->max_pic_num = 1 << (sps->log2_max_frame_num + 1); } - if (h->nal_unit_type == NAL_IDR_SLICE) + if (nal->type == NAL_IDR_SLICE) get_ue_golomb(&sl->gb); /* idr_pic_id */ if (sps->poc_type == 0) { @@ -1346,7 +1262,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (!h->setup_finished) h->poc.poc_lsb = poc_lsb; - if (pps->pic_order_present == 1 && h->picture_structure == PICT_FRAME) { + if (pps->pic_order_present == 1 && picture_structure == PICT_FRAME) { int delta_poc_bottom = get_se_golomb(&sl->gb); if (!h->setup_finished) h->poc.delta_poc_bottom = delta_poc_bottom; @@ -1359,7 +1275,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (!h->setup_finished) h->poc.delta_poc[0] = delta_poc; - if (pps->pic_order_present == 1 && h->picture_structure == PICT_FRAME) { + if (pps->pic_order_present == 1 && picture_structure == PICT_FRAME) { delta_poc = get_se_golomb(&sl->gb); if (!h->setup_finished) @@ -1367,10 +1283,6 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } - if (!h->setup_finished) - ff_h264_init_poc(h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc, - sps, &h->poc, h->picture_structure, h->nal_ref_idc); - if (pps->redundant_pic_cnt_present) sl->redundant_pic_count = get_ue_golomb(&sl->gb); @@ -1379,7 +1291,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) ret = ff_h264_parse_ref_count(&sl->list_count, sl->ref_count, &sl->gb, pps, sl->slice_type_nos, - h->picture_structure); + picture_structure); if (ret < 0) return ret; @@ -1391,48 +1303,24 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } + sl->pwt.use_weight = 0; + for (i = 0; i < 2; i++) { + sl->pwt.luma_weight_flag[i] = 0; + sl->pwt.chroma_weight_flag[i] = 0; + } if ((pps->weighted_pred && sl->slice_type_nos == AV_PICTURE_TYPE_P) || (pps->weighted_bipred_idc == 1 && sl->slice_type_nos == AV_PICTURE_TYPE_B)) ff_h264_pred_weight_table(&sl->gb, sps, sl->ref_count, sl->slice_type_nos, &sl->pwt); - else if (pps->weighted_bipred_idc == 2 && - sl->slice_type_nos == AV_PICTURE_TYPE_B) { - implicit_weight_table(h, sl, -1); - } else { - sl->pwt.use_weight = 0; - for (i = 0; i < 2; i++) { - sl->pwt.luma_weight_flag[i] = 0; - sl->pwt.chroma_weight_flag[i] = 0; - } - } - // If frame-mt is enabled, only update mmco tables for the first slice - // in a field. Subsequent slices can temporarily clobber h->mmco_index - // or h->mmco, which will cause ref list mix-ups and decoding errors - // further down the line. This may break decoding if the first slice is - // corrupt, thus we only do this if frame-mt is enabled. - if (h->nal_ref_idc) { - ret = ff_h264_decode_ref_pic_marking(h, &sl->gb, - !(h->avctx->active_thread_type & FF_THREAD_FRAME) || - h->current_slice == 0); + sl->explicit_ref_marking = 0; + if (nal->ref_idc) { + ret = ff_h264_decode_ref_pic_marking(h, sl, &sl->gb); if (ret < 0 && (h->avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; } - if (FRAME_MBAFF(h)) { - ff_h264_fill_mbaff_ref_list(sl); - - if (pps->weighted_bipred_idc == 2 && sl->slice_type_nos == AV_PICTURE_TYPE_B) { - implicit_weight_table(h, sl, 0); - implicit_weight_table(h, sl, 1); - } - } - - if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) - ff_h264_direct_dist_scale_factor(h, sl); - ff_h264_direct_ref_list_init(h, sl); - if (sl->slice_type_nos != AV_PICTURE_TYPE_I && pps->cabac) { tmp = get_ue_golomb_31(&sl->gb); if (tmp > 2) { @@ -1449,8 +1337,8 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) return AVERROR_INVALIDDATA; } sl->qscale = tmp; - sl->chroma_qp[0] = get_chroma_qp(h, 0, sl->qscale); - sl->chroma_qp[1] = get_chroma_qp(h, 1, sl->qscale); + sl->chroma_qp[0] = get_chroma_qp(pps, 0, sl->qscale); + sl->chroma_qp[1] = get_chroma_qp(pps, 1, sl->qscale); // FIXME qscale / qp ... stuff if (sl->slice_type == AV_PICTURE_TYPE_SP) get_bits1(&sl->gb); /* sp_for_switch_flag */ @@ -1487,40 +1375,128 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) } } + return 0; +} + +/** + * Decode a slice header. + * This will (re)initialize the decoder and call h264_frame_start() as needed. + * + * @param h h264context + * + * @return 0 if okay, <0 if an error occurred + */ +int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl, + const H2645NAL *nal) +{ + int i, j, ret = 0; + + ret = h264_slice_header_parse(h, sl, nal); + if (ret < 0) + return ret; + + if (sl->first_mb_addr == 0) { // FIXME better field boundary detection + if (h->current_slice && h->cur_pic_ptr && FIELD_PICTURE(h)) { + ff_h264_field_end(h, sl, 1); + } + + h->current_slice = 0; + if (!h->first_field) { + if (h->cur_pic_ptr && !h->droppable) { + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, + h->picture_structure == PICT_BOTTOM_FIELD); + } + h->cur_pic_ptr = NULL; + } + } + + if (h->current_slice == 0) { + ret = h264_field_start(h, sl, nal); + if (ret < 0) + return ret; + } else { + if (h->ps.pps != (const PPS*)h->ps.pps_list[sl->pps_id]->data) { + av_log(h->avctx, AV_LOG_ERROR, "PPS changed between slices\n"); + return AVERROR_INVALIDDATA; + } + + if (h->picture_structure != sl->picture_structure || + h->droppable != (nal->ref_idc == 0)) { + av_log(h->avctx, AV_LOG_ERROR, + "Changing field mode (%d -> %d) between slices is not allowed\n", + h->picture_structure, sl->picture_structure); + return AVERROR_INVALIDDATA; + } else if (!h->cur_pic_ptr) { + av_log(h->avctx, AV_LOG_ERROR, + "unset cur_pic_ptr on slice %d\n", + h->current_slice + 1); + return AVERROR_INVALIDDATA; + } + } + + assert(h->mb_num == h->mb_width * h->mb_height); + if (sl->first_mb_addr << FIELD_OR_MBAFF_PICTURE(h) >= h->mb_num || + sl->first_mb_addr >= h->mb_num) { + av_log(h->avctx, AV_LOG_ERROR, "first_mb_in_slice overflow\n"); + return AVERROR_INVALIDDATA; + } + sl->resync_mb_x = sl->mb_x = sl->first_mb_addr % h->mb_width; + sl->resync_mb_y = sl->mb_y = (sl->first_mb_addr / h->mb_width) << + FIELD_OR_MBAFF_PICTURE(h); + if (h->picture_structure == PICT_BOTTOM_FIELD) + sl->resync_mb_y = sl->mb_y = sl->mb_y + 1; + assert(sl->mb_y < h->mb_height); + + if (!h->setup_finished) { + ff_h264_init_poc(h->cur_pic_ptr->field_poc, &h->cur_pic_ptr->poc, + h->ps.sps, &h->poc, h->picture_structure, nal->ref_idc); + + memcpy(h->mmco, sl->mmco, sl->nb_mmco * sizeof(*h->mmco)); + h->nb_mmco = sl->nb_mmco; + h->explicit_ref_marking = sl->explicit_ref_marking; + } + + ret = ff_h264_build_ref_list(h, sl); + if (ret < 0) + return ret; + + if (h->ps.pps->weighted_bipred_idc == 2 && + sl->slice_type_nos == AV_PICTURE_TYPE_B) { + implicit_weight_table(h, sl, -1); + if (FRAME_MBAFF(h)) { + implicit_weight_table(h, sl, 0); + implicit_weight_table(h, sl, 1); + } + } + + if (sl->slice_type_nos == AV_PICTURE_TYPE_B && !sl->direct_spatial_mv_pred) + ff_h264_direct_dist_scale_factor(h, sl); + ff_h264_direct_ref_list_init(h, sl); + if (h->avctx->skip_loop_filter >= AVDISCARD_ALL || (h->avctx->skip_loop_filter >= AVDISCARD_NONKEY && sl->slice_type_nos != AV_PICTURE_TYPE_I) || (h->avctx->skip_loop_filter >= AVDISCARD_BIDIR && sl->slice_type_nos == AV_PICTURE_TYPE_B) || (h->avctx->skip_loop_filter >= AVDISCARD_NONREF && - h->nal_ref_idc == 0)) + nal->ref_idc == 0)) sl->deblocking_filter = 0; - if (sl->deblocking_filter == 1 && h->max_contexts > 1) { + if (sl->deblocking_filter == 1 && h->nb_slice_ctx > 1) { if (h->avctx->flags2 & AV_CODEC_FLAG2_FAST) { /* Cheat slightly for speed: * Do not bother to deblock across slices. */ sl->deblocking_filter = 2; } else { - h->max_contexts = 1; - if (!h->single_decode_warning) { - av_log(h->avctx, AV_LOG_INFO, - "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n"); - h->single_decode_warning = 1; - } - if (sl != h->slice_ctx) { - av_log(h->avctx, AV_LOG_ERROR, - "Deblocking switched inside frame.\n"); - return 1; - } + h->postpone_filter = 1; } } sl->qp_thresh = 15 - FFMIN(sl->slice_alpha_c0_offset, sl->slice_beta_offset) - FFMAX3(0, - pps->chroma_qp_index_offset[0], - pps->chroma_qp_index_offset[1]) + - 6 * (sps->bit_depth_luma - 8); + h->ps.pps->chroma_qp_index_offset[0], + h->ps.pps->chroma_qp_index_offset[1]) + + 6 * (h->ps.sps->bit_depth_luma - 8); sl->slice_num = ++h->current_slice; if (sl->slice_num >= MAX_SLICES) { @@ -1530,7 +1506,7 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) for (j = 0; j < 2; j++) { int id_list[16]; - int *ref2frm = sl->ref2frm[sl->slice_num & (MAX_SLICES - 1)][j]; + int *ref2frm = h->ref2frm[sl->slice_num & (MAX_SLICES - 1)][j]; for (i = 0; i < 16; i++) { id_list[i] = 60; if (j < sl->list_count && i < sl->ref_count[j] && @@ -1563,14 +1539,14 @@ int ff_h264_decode_slice_header(H264Context *h, H264SliceContext *sl) if (h->avctx->debug & FF_DEBUG_PICT_INFO) { av_log(h->avctx, AV_LOG_DEBUG, - "slice:%d %s mb:%d %c%s%s pps:%u frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", + "slice:%d %s mb:%d %c%s%s frame:%d poc:%d/%d ref:%d/%d qp:%d loop:%d:%d:%d weight:%d%s %s\n", sl->slice_num, (h->picture_structure == PICT_FRAME ? "F" : h->picture_structure == PICT_TOP_FIELD ? "T" : "B"), - first_mb_in_slice, + sl->mb_y * h->mb_width + sl->mb_x, av_get_picture_type_char(sl->slice_type), sl->slice_type_fixed ? " fix" : "", - h->nal_unit_type == NAL_IDR_SLICE ? " IDR" : "", - pps_id, h->poc.frame_num, + nal->type == NAL_IDR_SLICE ? " IDR" : "", + h->poc.frame_num, h->cur_pic_ptr->field_poc[0], h->cur_pic_ptr->field_poc[1], sl->ref_count[0], sl->ref_count[1], @@ -1618,7 +1594,7 @@ static av_always_inline void fill_filter_caches_inter(const H264Context *h, if (USES_LIST(top_type, list)) { const int b_xy = h->mb2b_xy[top_xy] + 3 * b_stride; const int b8_xy = 4 * top_xy + 2; - int (*ref2frm)[64] = sl->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); + int (*ref2frm)[64] = h->ref2frm[h->slice_table[top_xy] & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); AV_COPY128(mv_dst - 1 * 8, h->cur_pic.motion_val[list][b_xy + 0]); ref_cache[0 - 1 * 8] = ref_cache[1 - 1 * 8] = ref2frm[list][h->cur_pic.ref_index[list][b8_xy + 0]]; @@ -1633,7 +1609,7 @@ static av_always_inline void fill_filter_caches_inter(const H264Context *h, if (USES_LIST(left_type[LTOP], list)) { const int b_xy = h->mb2b_xy[left_xy[LTOP]] + 3; const int b8_xy = 4 * left_xy[LTOP] + 1; - int (*ref2frm)[64] = sl->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); + int (*ref2frm)[64] = h->ref2frm[h->slice_table[left_xy[LTOP]] & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); AV_COPY32(mv_dst - 1 + 0, h->cur_pic.motion_val[list][b_xy + b_stride * 0]); AV_COPY32(mv_dst - 1 + 8, h->cur_pic.motion_val[list][b_xy + b_stride * 1]); AV_COPY32(mv_dst - 1 + 16, h->cur_pic.motion_val[list][b_xy + b_stride * 2]); @@ -1666,7 +1642,7 @@ static av_always_inline void fill_filter_caches_inter(const H264Context *h, { int8_t *ref = &h->cur_pic.ref_index[list][4 * mb_xy]; - int (*ref2frm)[64] = sl->ref2frm[sl->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); + int (*ref2frm)[64] = h->ref2frm[sl->slice_num & (MAX_SLICES - 1)][0] + (MB_MBAFF(sl) ? 20 : 2); uint32_t ref01 = (pack16to32(ref2frm[list][ref[0]], ref2frm[list][ref[1]]) & 0x00FF00FF) * 0x0101; uint32_t ref23 = (pack16to32(ref2frm[list][ref[2]], ref2frm[list][ref[3]]) & 0x00FF00FF) * 0x0101; AV_WN32A(&ref_cache[0 * 8], ref01); @@ -1697,9 +1673,6 @@ static int fill_filter_caches(const H264Context *h, H264SliceContext *sl, int mb top_xy = mb_xy - (h->mb_stride << MB_FIELD(sl)); - /* Wow, what a mess, why didn't they simplify the interlacing & intra - * stuff, I can't imagine that these complex rules are worth it. */ - left_xy[LBOT] = left_xy[LTOP] = mb_xy - 1; if (FRAME_MBAFF(h)) { const int left_mb_field_flag = IS_INTERLACED(h->cur_pic.mb_type[mb_xy - 1]); @@ -1841,14 +1814,15 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x, const int pixel_shift = h->pixel_shift; const int block_h = 16 >> h->chroma_y_shift; + if (h->postpone_filter) + return; + if (sl->deblocking_filter) { for (mb_x = start_x; mb_x < end_x; mb_x++) for (mb_y = end_mb_y - FRAME_MBAFF(h); mb_y <= end_mb_y; mb_y++) { int mb_xy, mb_type; mb_xy = sl->mb_xy = mb_x + mb_y * h->mb_stride; - sl->slice_num = h->slice_table[mb_xy]; mb_type = h->cur_pic.mb_type[mb_xy]; - sl->list_count = h->list_counts[mb_xy]; if (FRAME_MBAFF(h)) sl->mb_mbaff = @@ -1882,8 +1856,8 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x, uvlinesize, 0); if (fill_filter_caches(h, sl, mb_type)) continue; - sl->chroma_qp[0] = get_chroma_qp(h, 0, h->cur_pic.qscale_table[mb_xy]); - sl->chroma_qp[1] = get_chroma_qp(h, 1, h->cur_pic.qscale_table[mb_xy]); + sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, h->cur_pic.qscale_table[mb_xy]); + sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, h->cur_pic.qscale_table[mb_xy]); if (FRAME_MBAFF(h)) { ff_h264_filter_mb(h, sl, mb_x, mb_y, dest_y, dest_cb, dest_cr, @@ -1897,8 +1871,8 @@ static void loop_filter(const H264Context *h, H264SliceContext *sl, int start_x, sl->slice_type = old_slice_type; sl->mb_x = end_x; sl->mb_y = end_mb_y - FRAME_MBAFF(h); - sl->chroma_qp[0] = get_chroma_qp(h, 0, sl->qscale); - sl->chroma_qp[1] = get_chroma_qp(h, 1, sl->qscale); + sl->chroma_qp[0] = get_chroma_qp(h->ps.pps, 0, sl->qscale); + sl->chroma_qp[1] = get_chroma_qp(h->ps.pps, 1, sl->qscale); } static void predict_field_decoding_flag(const H264Context *h, H264SliceContext *sl) @@ -1965,6 +1939,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) H264SliceContext *sl = arg; const H264Context *h = sl->h264; int lf_x_start = sl->mb_x; + int orig_deblock = sl->deblocking_filter; int ret; sl->linesize = h->cur_pic_ptr->f->linesize[0]; @@ -1976,6 +1951,9 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) sl->mb_skip_run = -1; + if (h->postpone_filter) + sl->deblocking_filter = 0; + sl->is_complex = FRAME_MBAFF(h) || h->picture_structure != PICT_FRAME || avctx->codec_id != AV_CODEC_ID_H264 || (CONFIG_GRAY && (h->flags & AV_CODEC_FLAG_GRAY)); @@ -2025,7 +2003,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) sl->mb_y, ER_MB_END); if (sl->mb_x >= lf_x_start) loop_filter(h, sl, lf_x_start, sl->mb_x + 1); - return 0; + goto finish; } if (ret < 0 || sl->cabac.bytestream > sl->cabac.bytestream_end + 2) { av_log(h->avctx, AV_LOG_ERROR, @@ -2056,7 +2034,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) sl->mb_y, ER_MB_END); if (sl->mb_x > lf_x_start) loop_filter(h, sl, lf_x_start, sl->mb_x); - return 0; + goto finish; } } } else { @@ -2110,7 +2088,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) er_add_slice(sl, sl->resync_mb_x, sl->resync_mb_y, sl->mb_x - 1, sl->mb_y, ER_MB_END); - return 0; + goto finish; } else { er_add_slice(sl, sl->resync_mb_x, sl->resync_mb_y, sl->mb_x - 1, sl->mb_y, ER_MB_END); @@ -2130,7 +2108,7 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) if (sl->mb_x > lf_x_start) loop_filter(h, sl, lf_x_start, sl->mb_x); - return 0; + goto finish; } else { er_add_slice(sl, sl->resync_mb_x, sl->resync_mb_y, sl->mb_x, sl->mb_y, ER_MB_ERROR); @@ -2140,6 +2118,10 @@ static int decode_slice(struct AVCodecContext *avctx, void *arg) } } } + +finish: + sl->deblocking_filter = orig_deblock; + return 0; } /** @@ -2160,6 +2142,7 @@ int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count) int ret; h->slice_ctx[0].next_slice_idx = h->mb_width * h->mb_height; + h->postpone_filter = 0; ret = decode_slice(avctx, &h->slice_ctx[0]); h->mb_y = h->slice_ctx[0].mb_y; @@ -2193,6 +2176,24 @@ int ff_h264_execute_decode_slices(H264Context *h, unsigned context_count) h->mb_y = sl->mb_y; for (i = 1; i < context_count; i++) h->slice_ctx[0].er.error_count += h->slice_ctx[i].er.error_count; + + if (h->postpone_filter) { + h->postpone_filter = 0; + + for (i = 0; i < context_count; i++) { + int y_end, x_end; + + sl = &h->slice_ctx[i]; + y_end = FFMIN(sl->mb_y + 1, h->mb_height); + x_end = (sl->mb_y >= h->mb_height) ? h->mb_width : sl->mb_x; + + for (j = sl->resync_mb_y; j < y_end; j += 1 + FIELD_OR_MBAFF_PICTURE(h)) { + sl->mb_y = j; + loop_filter(h, sl, j > sl->resync_mb_y ? 0 : sl->resync_mb_x, + j == y_end - 1 ? x_end : h->mb_width); + } + } + } } return 0;