From a0e1c3517a656dd32293f054a339e0ac73328138 Mon Sep 17 00:00:00 2001 From: Gildas Cocherel Date: Wed, 25 Jun 2014 21:08:12 +0200 Subject: [PATCH] hevc: remove unused array min_cb_addr_zs Signed-off-by: Anton Khirnov --- libavcodec/hevc.h | 1 - libavcodec/hevc_ps.c | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 959cd58..4b8bcf8 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -523,7 +523,6 @@ typedef struct HEVCPPS { int *ctb_addr_ts_to_rs; ///< CtbAddrTSToRS int *tile_id; ///< TileId int *tile_pos_rs; ///< TilePosRS - int *min_cb_addr_zs; ///< MinCbAddrZS int *min_tb_addr_zs; ///< MinTbAddrZS } HEVCPPS; diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 65f41b2..4d1d027 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -980,7 +980,6 @@ static void hevc_pps_free(void *opaque, uint8_t *data) av_freep(&pps->ctb_addr_ts_to_rs); av_freep(&pps->tile_pos_rs); av_freep(&pps->tile_id); - av_freep(&pps->min_cb_addr_zs); av_freep(&pps->min_tb_addr_zs); av_freep(&pps); @@ -1235,10 +1234,9 @@ int ff_hevc_decode_nal_pps(HEVCContext *s) pps->ctb_addr_rs_to_ts = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->ctb_addr_rs_to_ts)); pps->ctb_addr_ts_to_rs = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->ctb_addr_ts_to_rs)); pps->tile_id = av_malloc_array(pic_area_in_ctbs, sizeof(*pps->tile_id)); - pps->min_cb_addr_zs = av_malloc_array(pic_area_in_min_cbs, sizeof(*pps->min_cb_addr_zs)); pps->min_tb_addr_zs = av_malloc_array(pic_area_in_min_tbs, sizeof(*pps->min_tb_addr_zs)); if (!pps->ctb_addr_rs_to_ts || !pps->ctb_addr_ts_to_rs || - !pps->tile_id || !pps->min_cb_addr_zs || !pps->min_tb_addr_zs) { + !pps->tile_id || !pps->min_tb_addr_zs) { ret = AVERROR(ENOMEM); goto err; } @@ -1292,21 +1290,6 @@ int ff_hevc_decode_nal_pps(HEVCContext *s) for (i = 0; i < pps->num_tile_columns; i++) pps->tile_pos_rs[j * pps->num_tile_columns + i] = pps->row_bd[j] * sps->ctb_width + pps->col_bd[i]; - for (y = 0; y < sps->min_cb_height; y++) { - for (x = 0; x < sps->min_cb_width; x++) { - int tb_x = x >> sps->log2_diff_max_min_coding_block_size; - int tb_y = y >> sps->log2_diff_max_min_coding_block_size; - int ctb_addr_rs = sps->ctb_width * tb_y + tb_x; - int val = pps->ctb_addr_rs_to_ts[ctb_addr_rs] << - (sps->log2_diff_max_min_coding_block_size * 2); - for (i = 0; i < sps->log2_diff_max_min_coding_block_size; i++) { - int m = 1 << i; - val += (m & x ? m * m : 0) + (m & y ? 2 * m * m : 0); - } - pps->min_cb_addr_zs[y * sps->min_cb_width + x] = val; - } - } - log2_diff_ctb_min_tb_size = sps->log2_ctb_size - sps->log2_min_tb_size; for (y = 0; y < sps->min_tb_height; y++) { for (x = 0; x < sps->min_tb_width; x++) { -- 2.7.4