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
f11fb882
Commit
f11fb882
authored
Mar 27, 2017
by
hui su
Committed by
Hui Su
Mar 28, 2017
Browse files
Add av1_ prefix to fwd_txfm()
Change-Id: Ie18fd2b8a3caf3948748ee353fe41e37f5803ba3
parent
233ef947
Changes
4
Hide whitespace changes
Inline
Side-by-side
av1/decoder/decodeframe.c
View file @
f11fb882
...
...
@@ -498,10 +498,10 @@ static int av1_pvq_decode_helper2(AV1_COMMON *cm, MACROBLOCKD *const xd,
#if CONFIG_AOM_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
fwd_txfm_param
.
bd
=
xd
->
bd
;
highbd_fwd_txfm
(
pred
,
pvq_ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
highbd_fwd_txfm
(
pred
,
pvq_ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
}
else
{
#endif // CONFIG_AOM_HIGHBITDEPTH
fwd_txfm
(
pred
,
pvq_ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
fwd_txfm
(
pred
,
pvq_ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
#if CONFIG_AOM_HIGHBITDEPTH
}
#endif // CONFIG_AOM_HIGHBITDEPTH
...
...
av1/encoder/encodemb.c
View file @
f11fb882
...
...
@@ -627,7 +627,7 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
#if CONFIG_AOM_HIGHBITDEPTH
fwd_txfm_param
.
bd
=
xd
->
bd
;
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
highbd_fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
xform_quant_idx
!=
AV1_XFORM_QUANT_SKIP_QUANT
)
{
if
(
LIKELY
(
!
x
->
skip_block
))
{
quant_func_list
[
xform_quant_idx
][
QUANT_FUNC_HIGHBD
](
...
...
@@ -643,7 +643,7 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
return
;
}
#endif // CONFIG_AOM_HIGHBITDEPTH
fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
fwd_txfm
(
src_diff
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
if
(
xform_quant_idx
!=
AV1_XFORM_QUANT_SKIP_QUANT
)
{
if
(
LIKELY
(
!
x
->
skip_block
))
{
quant_func_list
[
xform_quant_idx
][
QUANT_FUNC_LOWBD
](
...
...
@@ -661,12 +661,12 @@ void av1_xform_quant(const AV1_COMMON *cm, MACROBLOCK *x, int plane, int block,
#if CONFIG_AOM_HIGHBITDEPTH
fwd_txfm_param
.
bd
=
xd
->
bd
;
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
highbd_fwd_txfm
(
src_int16
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
highbd_fwd_txfm
(
pred
,
ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
highbd_fwd_txfm
(
src_int16
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
highbd_fwd_txfm
(
pred
,
ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
}
else
{
#endif
fwd_txfm
(
src_int16
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
fwd_txfm
(
pred
,
ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
fwd_txfm
(
src_int16
,
coeff
,
diff_stride
,
&
fwd_txfm_param
);
av1_
fwd_txfm
(
pred
,
ref_coeff
,
diff_stride
,
&
fwd_txfm_param
);
#if CONFIG_AOM_HIGHBITDEPTH
}
#endif
...
...
av1/encoder/hybrid_fwd_txfm.c
View file @
f11fb882
...
...
@@ -403,8 +403,8 @@ static void highbd_fwd_txfm_64x64(const int16_t *src_diff, tran_low_t *coeff,
#endif // CONFIG_TX64X64
#endif // CONFIG_AOM_HIGHBITDEPTH
void
fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
)
{
void
av1_
fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
)
{
const
int
fwd_txfm_opt
=
FWD_TXFM_OPT_NORMAL
;
const
TX_TYPE
tx_type
=
fwd_txfm_param
->
tx_type
;
const
TX_SIZE
tx_size
=
fwd_txfm_param
->
tx_size
;
...
...
@@ -455,8 +455,8 @@ void fwd_txfm(const int16_t *src_diff, tran_low_t *coeff, int diff_stride,
}
#if CONFIG_AOM_HIGHBITDEPTH
void
highbd_fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
)
{
void
av1_
highbd_fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
)
{
const
int
fwd_txfm_opt
=
FWD_TXFM_OPT_NORMAL
;
const
TX_TYPE
tx_type
=
fwd_txfm_param
->
tx_type
;
const
TX_SIZE
tx_size
=
fwd_txfm_param
->
tx_size
;
...
...
av1/encoder/hybrid_fwd_txfm.h
View file @
f11fb882
...
...
@@ -29,12 +29,12 @@ typedef struct FWD_TXFM_PARAM {
extern
"C"
{
#endif
void
fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
);
void
av1_
fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
);
#if CONFIG_AOM_HIGHBITDEPTH
void
highbd_fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
);
void
av1_
highbd_fwd_txfm
(
const
int16_t
*
src_diff
,
tran_low_t
*
coeff
,
int
diff_stride
,
FWD_TXFM_PARAM
*
fwd_txfm_param
);
#endif // CONFIG_AOM_HIGHBITDEPTH
#ifdef __cplusplus
...
...
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