diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-27 08:17:29 +0000 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-07-28 08:03:53 +0000 |
| commit | e36a2f4c5280e2779b0e88974295a711cf8d88be (patch) | |
| tree | e4aa6a3b0d1ea5b95f7438581ec9a218f4b26c66 /libavcodec | |
| parent | 4b169321b84502302f2badb056ebee4fdaea94fa (diff) | |
| download | ffmpeg-e36a2f4c5280e2779b0e88974295a711cf8d88be.tar.gz | |
hevc: eliminate an unnecessary array
We do not need to store the value of the split flag.
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/hevc.c | 14 | ||||
| -rw-r--r-- | libavcodec/hevc.h | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c index d9c9c7104d..18c7920764 100644 --- a/libavcodec/hevc.c +++ b/libavcodec/hevc.c @@ -166,7 +166,6 @@ static void pic_arrays_free(HEVCContext *s) { av_freep(&s->sao); av_freep(&s->deblock); - av_freep(&s->split_cu_flag); av_freep(&s->skip_flag); av_freep(&s->tab_ct_depth); @@ -192,7 +191,6 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) int log2_min_cb_size = sps->log2_min_cb_size; int width = sps->width; int height = sps->height; - int pic_size = width * height; int pic_size_in_ctb = ((width >> log2_min_cb_size) + 1) * ((height >> log2_min_cb_size) + 1); int ctb_count = sps->ctb_width * sps->ctb_height; @@ -203,8 +201,7 @@ static int pic_arrays_init(HEVCContext *s, const HEVCSPS *sps) s->sao = av_mallocz_array(ctb_count, sizeof(*s->sao)); s->deblock = av_mallocz_array(ctb_count, sizeof(*s->deblock)); - s->split_cu_flag = av_malloc(pic_size); - if (!s->sao || !s->deblock || !s->split_cu_flag) + if (!s->sao || !s->deblock) goto fail; s->skip_flag = av_malloc(pic_size_in_ctb); @@ -2234,16 +2231,15 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0, { HEVCLocalContext *lc = &s->HEVClc; const int cb_size = 1 << log2_cb_size; + int split_cu; lc->ct.depth = cb_depth; if (x0 + cb_size <= s->sps->width && y0 + cb_size <= s->sps->height && log2_cb_size > s->sps->log2_min_cb_size) { - SAMPLE(s->split_cu_flag, x0, y0) = - ff_hevc_split_coding_unit_flag_decode(s, cb_depth, x0, y0); + split_cu = ff_hevc_split_coding_unit_flag_decode(s, cb_depth, x0, y0); } else { - SAMPLE(s->split_cu_flag, x0, y0) = - (log2_cb_size > s->sps->log2_min_cb_size); + split_cu = (log2_cb_size > s->sps->log2_min_cb_size); } if (s->pps->cu_qp_delta_enabled_flag && log2_cb_size >= s->sps->log2_ctb_size - s->pps->diff_cu_qp_delta_depth) { @@ -2251,7 +2247,7 @@ static int hls_coding_quadtree(HEVCContext *s, int x0, int y0, lc->tu.cu_qp_delta = 0; } - if (SAMPLE(s->split_cu_flag, x0, y0)) { + if (split_cu) { const int cb_size_split = cb_size >> 1; const int x1 = x0 + cb_size_split; const int y1 = y0 + cb_size_split; diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 978681b586..e8f8f1a550 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -806,7 +806,6 @@ typedef struct HEVCContext { VideoDSPContext vdsp; BswapDSPContext bdsp; int8_t *qp_y_tab; - uint8_t *split_cu_flag; uint8_t *horizontal_bs; uint8_t *vertical_bs; |