Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
7e992973
Commit
7e992973
authored
Oct 31, 2016
by
Jingning Han
Browse files
Replace get_tx2d_size() with direct tx_size_2d[] table access
Change-Id: I20040cdb5d9fdbf6c50082e5e17b4cfbd1926b13
parent
42a0fb36
Changes
4
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
7e992973
...
...
@@ -443,10 +443,6 @@ static INLINE int supertx_enabled(const MB_MODE_INFO *mbmi) {
}
#endif // CONFIG_SUPERTX
static
INLINE
int
get_tx2d_size
(
TX_SIZE
tx_size
)
{
return
num_4x4_blocks_txsize_lookup
[
tx_size
]
<<
4
;
}
#if CONFIG_EXT_TX
#define ALLOW_INTRA_EXT_TX 1
...
...
av1/decoder/detokenize.c
View file @
7e992973
...
...
@@ -63,8 +63,8 @@ static int decode_coefs(MACROBLOCKD *xd, PLANE_TYPE type, tran_low_t *dqcoeff,
#endif
{
FRAME_COUNTS
*
counts
=
xd
->
counts
;
const
int
max_eob
=
get_tx2d_size
(
tx_size
);
FRAME_CONTEXT
*
const
fc
=
xd
->
fc
;
const
int
max_eob
=
tx_size_2d
[
tx_size
];
const
int
ref
=
is_inter_block
(
&
xd
->
mi
[
0
]
->
mbmi
);
#if CONFIG_AOM_QM
const
qm_val_t
*
iqmatrix
=
iqm
[
!
ref
][
tx_size
];
...
...
av1/encoder/bitstream.c
View file @
7e992973
...
...
@@ -719,11 +719,11 @@ static void update_supertx_probs(AV1_COMMON *cm, int probwt, aom_writer *w) {
static
void
pack_mb_tokens
(
aom_writer
*
w
,
const
TOKENEXTRA
**
tp
,
const
TOKENEXTRA
*
const
stop
,
aom_bit_depth_t
bit_depth
,
const
TX_SIZE
tx
)
{
aom_bit_depth_t
bit_depth
,
const
TX_SIZE
tx
_size
)
{
const
TOKENEXTRA
*
p
=
*
tp
;
#if CONFIG_VAR_TX
int
count
=
0
;
const
int
seg_eob
=
get_tx2d_size
(
tx
)
;
const
int
seg_eob
=
tx_size_2d
[
tx_size
]
;
#endif
#if CONFIG_AOM_HIGHBITDEPTH
const
av1_extra_bit
*
const
extra_bits_table
=
...
...
@@ -786,7 +786,7 @@ static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
// be written excluding
// the sign bit.
int
skip_bits
=
(
extra_bits
->
base_val
==
CAT6_MIN_VAL
)
?
TX_SIZES
-
1
-
txsize_sqr_up_map
[
tx
]
?
TX_SIZES
-
1
-
txsize_sqr_up_map
[
tx
_size
]
:
0
;
if
(
bit_string_length
>
0
)
{
...
...
av1/encoder/encodemb.c
View file @
7e992973
...
...
@@ -451,7 +451,7 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
const
qm_val_t
*
iqmatrix
=
pd
->
seg_iqmatrix
[
seg_id
][
!
is_inter
][
tx_size
];
#endif
const
int16_t
*
src_diff
;
const
int
tx2d_size
=
get_tx2d
_size
(
tx_size
)
;
const
int
tx2d_size
=
tx
_size
_2d
[
tx_size
]
;
FWD_TXFM_PARAM
fwd_txfm_param
;
QUANT_PARAM
qparam
;
...
...
@@ -542,14 +542,13 @@ void av1_xform_quant_nuq(const AV1_COMMON *cm, MACROBLOCK *x, int plane,
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
highbd_quantize_32x32_nuq
(
coeff
,
get_tx2d_size
(
tx_size
),
x
->
skip_block
,
p
->
quant
,
p
->
quant_shift
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
coeff
,
tx_size_2d
[
tx_size
],
x
->
skip_block
,
p
->
quant
,
p
->
quant_shift
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
}
else
{
highbd_quantize_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant
,
p
->
quant_shift
,
pd
->
dequant
,
highbd_quantize_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
,
p
->
quant_shift
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
...
...
@@ -566,7 +565,7 @@ void av1_xform_quant_nuq(const AV1_COMMON *cm, MACROBLOCK *x, int plane,
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
}
else
{
quantize_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant
,
quantize_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
,
p
->
quant_shift
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
...
...
@@ -613,14 +612,14 @@ void av1_xform_quant_fp_nuq(const AV1_COMMON *cm, MACROBLOCK *x, int plane,
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
highbd_quantize_32x32_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
}
else
{
highbd_quantize_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
}
...
...
@@ -630,13 +629,13 @@ void av1_xform_quant_fp_nuq(const AV1_COMMON *cm, MACROBLOCK *x, int plane,
fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
quantize_32x32_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
quantize_32x32_fp_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
qcoeff
,
dqcoeff
,
eob
,
scan_order
->
scan
,
band
);
}
else
{
quantize_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant_fp
,
quantize_fp_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
,
pd
->
dequant
,
(
const
cuml_bins_type_nuq
*
)
p
->
cuml_bins_nuq
[
dq
],
(
const
dequant_val_type_nuq
*
)
pd
->
dequant_val_nuq
[
dq
],
...
...
@@ -681,11 +680,11 @@ void av1_xform_quant_dc_nuq(MACROBLOCK *x, int plane, int block, int blk_row,
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
highbd_quantize_dc_32x32_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant
[
0
],
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
[
0
],
p
->
quant_shift
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
else
{
highbd_quantize_dc_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
highbd_quantize_dc_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
[
0
],
p
->
quant_shift
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
...
...
@@ -696,12 +695,12 @@ void av1_xform_quant_dc_nuq(MACROBLOCK *x, int plane, int block, int blk_row,
fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
quantize_dc_32x32_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
quantize_dc_32x32_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
[
0
],
p
->
quant_shift
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
else
{
quantize_dc_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant
[
0
],
quantize_dc_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant
[
0
],
p
->
quant_shift
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
...
...
@@ -744,12 +743,12 @@ void av1_xform_quant_dc_fp_nuq(MACROBLOCK *x, int plane, int block, int blk_row,
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
highbd_quantize_dc_32x32_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
else
{
highbd_quantize_dc_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
...
...
@@ -759,12 +758,12 @@ void av1_xform_quant_dc_fp_nuq(MACROBLOCK *x, int plane, int block, int blk_row,
fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
tx_size
==
TX_32X32
)
{
quantize_dc_32x32_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
quantize_dc_32x32_fp_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
else
{
quantize_dc_fp_nuq
(
coeff
,
get_tx2d
_size
(
tx_size
)
,
x
->
skip_block
,
quantize_dc_fp_nuq
(
coeff
,
tx
_size
_2d
[
tx_size
]
,
x
->
skip_block
,
p
->
quant_fp
[
0
],
pd
->
dequant
[
0
],
p
->
cuml_bins_nuq
[
dq
][
0
],
pd
->
dequant_val_nuq
[
dq
][
0
],
qcoeff
,
dqcoeff
,
eob
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment