From a18f11158216c22f4a69e44f8cbb59b300a7f10c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 7 Feb 2014 04:30:31 +0100 Subject: [PATCH] avcodec/hevc: clear tab_slice_address of ctb on error. This allows us to detect which areas have failed to decode Signed-off-by: Michael Niedermayer --- libavcodec/hevc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index 8e8adf1c8d..6fcd548016 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -1932,8 +1932,11 @@ static int hls_decode_entry(AVCodecContext *avctxt, void *isFilterThread) s->filter_slice_edges[ctb_addr_rs] = s->sh.slice_loop_filter_across_slices_enabled_flag; more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0); - if (more_data < 0) + if (more_data < 0) { + s->tab_slice_address[ctb_addr_rs] = -1; return more_data; + } + ctb_addr_ts++; ff_hevc_save_states(s, ctb_addr_ts); @@ -1999,8 +2002,10 @@ static int hls_decode_entry_wpp(AVCodecContext *avctxt, void *input_ctb_row, int hls_sao_param(s, x_ctb >> s->sps->log2_ctb_size, y_ctb >> s->sps->log2_ctb_size); more_data = hls_coding_quadtree(s, x_ctb, y_ctb, s->sps->log2_ctb_size, 0); - if (more_data < 0) + if (more_data < 0) { + s->tab_slice_address[ctb_addr_rs] = -1; return more_data; + } ctb_addr_ts++;