From f51d0f39c0fb3470d6b186974109428da91f1d1b Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Wed, 19 Mar 2014 16:52:47 +0100 Subject: h264: Split h264 slice decoding from nal decoding --- libavcodec/h264_picture.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 200 insertions(+) create mode 100644 libavcodec/h264_picture.c (limited to 'libavcodec/h264_picture.c') diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c new file mode 100644 index 0000000000..d7e6ce5e8d --- /dev/null +++ b/libavcodec/h264_picture.c @@ -0,0 +1,200 @@ +/* + * H.26L/H.264/AVC/JVT/14496-10/... decoder + * Copyright (c) 2003 Michael Niedermayer + * + * This file is part of Libav. + * + * Libav 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, + * 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 + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * H.264 / AVC / MPEG4 part10 codec. + * @author Michael Niedermayer + */ + +#include "libavutil/avassert.h" +#include "libavutil/imgutils.h" +#include "libavutil/timer.h" +#include "internal.h" +#include "cabac.h" +#include "cabac_functions.h" +#include "dsputil.h" +#include "error_resilience.h" +#include "avcodec.h" +#include "h264.h" +#include "h264data.h" +#include "h264chroma.h" +#include "h264_mvpred.h" +#include "golomb.h" +#include "mathops.h" +#include "mpegutils.h" +#include "rectangle.h" +#include "thread.h" + +void ff_h264_unref_picture(H264Context *h, H264Picture *pic) +{ + int off = offsetof(H264Picture, tf) + sizeof(pic->tf); + int i; + + if (!pic->f.buf[0]) + return; + + ff_thread_release_buffer(h->avctx, &pic->tf); + av_buffer_unref(&pic->hwaccel_priv_buf); + + av_buffer_unref(&pic->qscale_table_buf); + av_buffer_unref(&pic->mb_type_buf); + for (i = 0; i < 2; i++) { + av_buffer_unref(&pic->motion_val_buf[i]); + av_buffer_unref(&pic->ref_index_buf[i]); + } + + memset((uint8_t*)pic + off, 0, sizeof(*pic) - off); +} + +int ff_h264_ref_picture(H264Context *h, H264Picture *dst, H264Picture *src) +{ + int ret, i; + + av_assert0(!dst->f.buf[0]); + av_assert0(src->f.buf[0]); + + src->tf.f = &src->f; + dst->tf.f = &dst->f; + ret = ff_thread_ref_frame(&dst->tf, &src->tf); + if (ret < 0) + goto fail; + + dst->qscale_table_buf = av_buffer_ref(src->qscale_table_buf); + dst->mb_type_buf = av_buffer_ref(src->mb_type_buf); + if (!dst->qscale_table_buf || !dst->mb_type_buf) + goto fail; + dst->qscale_table = src->qscale_table; + dst->mb_type = src->mb_type; + + for (i = 0; i < 2; i++) { + dst->motion_val_buf[i] = av_buffer_ref(src->motion_val_buf[i]); + dst->ref_index_buf[i] = av_buffer_ref(src->ref_index_buf[i]); + if (!dst->motion_val_buf[i] || !dst->ref_index_buf[i]) + goto fail; + dst->motion_val[i] = src->motion_val[i]; + dst->ref_index[i] = src->ref_index[i]; + } + + if (src->hwaccel_picture_private) { + dst->hwaccel_priv_buf = av_buffer_ref(src->hwaccel_priv_buf); + if (!dst->hwaccel_priv_buf) + goto fail; + dst->hwaccel_picture_private = dst->hwaccel_priv_buf->data; + } + + for (i = 0; i < 2; i++) + dst->field_poc[i] = src->field_poc[i]; + + memcpy(dst->ref_poc, src->ref_poc, sizeof(src->ref_poc)); + memcpy(dst->ref_count, src->ref_count, sizeof(src->ref_count)); + + dst->poc = src->poc; + dst->frame_num = src->frame_num; + dst->mmco_reset = src->mmco_reset; + dst->pic_id = src->pic_id; + dst->long_ref = src->long_ref; + dst->mbaff = src->mbaff; + dst->field_picture = src->field_picture; + dst->needs_realloc = src->needs_realloc; + dst->reference = src->reference; + dst->recovered = src->recovered; + + return 0; +fail: + ff_h264_unref_picture(h, dst); + return ret; +} + +#if CONFIG_ERROR_RESILIENCE +static void h264_set_erpic(ERPicture *dst, H264Picture *src) +{ + int i; + + if (!src) + return; + + dst->f = &src->f; + dst->tf = &src->tf; + + for (i = 0; i < 2; i++) { + dst->motion_val[i] = src->motion_val[i]; + dst->ref_index[i] = src->ref_index[i]; + } + + dst->mb_type = src->mb_type; + dst->field_picture = src->field_picture; +} +#endif /* CONFIG_ERROR_RESILIENCE */ + +int ff_h264_field_end(H264Context *h, int in_setup) +{ + AVCodecContext *const avctx = h->avctx; + int err = 0; + h->mb_y = 0; + + if (!in_setup && !h->droppable) + ff_thread_report_progress(&h->cur_pic_ptr->tf, INT_MAX, + h->picture_structure == PICT_BOTTOM_FIELD); + + if (in_setup || !(avctx->active_thread_type & FF_THREAD_FRAME)) { + if (!h->droppable) { + err = ff_h264_execute_ref_pic_marking(h, h->mmco, h->mmco_index); + h->prev_poc_msb = h->poc_msb; + h->prev_poc_lsb = h->poc_lsb; + } + h->prev_frame_num_offset = h->frame_num_offset; + h->prev_frame_num = h->frame_num; + h->outputed_poc = h->next_outputed_poc; + } + + if (avctx->hwaccel) { + if (avctx->hwaccel->end_frame(avctx) < 0) + av_log(avctx, AV_LOG_ERROR, + "hardware accelerator failed to decode picture\n"); + } + + /* + * FIXME: Error handling code does not seem to support interlaced + * when slices span multiple rows + * The ff_er_add_slice calls don't work right for bottom + * fields; they cause massive erroneous error concealing + * Error marking covers both fields (top and bottom). + * This causes a mismatched s->error_count + * and a bad error table. Further, the error count goes to + * INT_MAX when called for bottom field, because mb_y is + * past end by one (callers fault) and resync_mb_y != 0 + * causes problems for the first MB line, too. + */ + if (CONFIG_ERROR_RESILIENCE && !FIELD_PICTURE(h)) { + h264_set_erpic(&h->er.cur_pic, h->cur_pic_ptr); + h264_set_erpic(&h->er.last_pic, + h->ref_count[0] ? &h->ref_list[0][0] : NULL); + h264_set_erpic(&h->er.next_pic, + h->ref_count[1] ? &h->ref_list[1][0] : NULL); + ff_er_frame_end(&h->er); + } + emms_c(); + + h->current_slice = 0; + + return err; +} -- cgit v1.2.3