diff options
| author | gcocherel <gildas.cocherel@laposte.net> | 2014-06-19 11:21:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-24 13:06:42 +0200 |
| commit | f7f1f4c7ce9ce689823e13a53b694eb14cbbf6e7 (patch) | |
| tree | d4e0e3c3b2cdff84025f857788d5b6ae0b62eec0 /libavcodec | |
| parent | fd504f7c6fb877301ec3b81e4b4a36c4047de0f4 (diff) | |
avcodec/hevc_ps: remove min_cb_addr_zs
(cherry picked from commit ff7926d5092f9d4158108963e977e8c992322ba4)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc.h | 1 | ||||
| -rw-r--r-- | libavcodec/hevc_ps.c | 19 |
2 files changed, 1 insertions, 19 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index cc02806b17..2c671926f9 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -531,7 +531,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 30e58a20b1..aa64d47763 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -981,7 +981,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); @@ -1236,10 +1235,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; } @@ -1293,21 +1291,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++) { |