diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-07-27 21:56:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-28 00:55:44 +0200 |
| commit | 77ef9fd1e938010600620c1d32cabd15e7d5b853 (patch) | |
| tree | 8b565e44f01965e9e2042455c6bde51b5698f6ac /libavcodec/hevc.h | |
| parent | 772f7f4eddbc4450443743984bf1d4da2f4bf84c (diff) | |
hevc: eliminate unnecessary cbf_c{b,r} arrays
- They are be replaced by passing additional parameters to the transform
functions.
- Adaptation to 4:2:2
Signed-off-by: Mickaël Raulet <mraulet@insa-rennes.fr>
cherry picked from commit f518bb22531c648f1c37f978b0c7ad2e71e04c25
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hevc.h')
| -rw-r--r-- | libavcodec/hevc.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index de1b5eaf78..cd38c461e6 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -82,8 +82,6 @@ */ #define SAMPLE(tab, x, y) ((tab)[(y) * s->sps->width + (x)]) #define SAMPLE_CTB(tab, x, y) ((tab)[(y) * min_cb_width + (x)]) -#define SAMPLE_CBF(tab, x, y) ((tab)[((y) & ((1<<log2_trafo_size)-1)) * MAX_CU_SIZE + ((x) & ((1<<log2_trafo_size)-1))]) -#define SAMPLE_CBF2(tab, x, y) ((tab)[(y) * MAX_CU_SIZE + (x)]) #define IS_IDR(s) ((s)->nal_unit_type == NAL_IDR_W_RADL || (s)->nal_unit_type == NAL_IDR_N_LP) #define IS_BLA(s) ((s)->nal_unit_type == NAL_BLA_W_RADL || (s)->nal_unit_type == NAL_BLA_W_LP || \ @@ -686,8 +684,6 @@ typedef struct PredictionUnit { } PredictionUnit; typedef struct TransformTree { - uint8_t cbf_cb[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE]; - uint8_t cbf_cr[MAX_TRANSFORM_DEPTH][MAX_CU_SIZE * MAX_CU_SIZE]; uint8_t cbf_luma; // Inferred parameters |