Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
bb9c73b0
Commit
bb9c73b0
authored
Mar 17, 2017
by
hui su
Committed by
Hui Su
Mar 20, 2017
Browse files
Add av1 prefix to inv_txfm_add
Change-Id: Id7cbb89ba344770297ef42bf1b09a2b9ba5a1378
parent
b4e25d2c
Changes
5
Hide whitespace changes
Inline
Side-by-side
av1/common/idct.c
View file @
bb9c73b0
...
...
@@ -2787,8 +2787,8 @@ void av1_highbd_inv_txfm_add_64x64(const tran_low_t *input, uint8_t *dest,
#endif // CONFIG_TX64X64
#endif // CONFIG_AOM_HIGHBITDEPTH
void
inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
)
{
void
av1_
inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
)
{
const
TX_TYPE
tx_type
=
inv_txfm_param
->
tx_type
;
const
TX_SIZE
tx_size
=
inv_txfm_param
->
tx_size
;
const
int
eob
=
inv_txfm_param
->
eob
;
...
...
@@ -2837,8 +2837,8 @@ void inv_txfm_add(const tran_low_t *input, uint8_t *dest, int stride,
}
#if CONFIG_AOM_HIGHBITDEPTH
void
highbd_inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
)
{
void
av1_
highbd_inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
)
{
const
TX_TYPE
tx_type
=
inv_txfm_param
->
tx_type
;
const
TX_SIZE
tx_size
=
inv_txfm_param
->
tx_size
;
const
int
eob
=
inv_txfm_param
->
eob
;
...
...
av1/common/idct.h
View file @
bb9c73b0
...
...
@@ -76,8 +76,8 @@ void av1_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest, int stride,
int
eob
,
TX_TYPE
tx_type
);
void
av1_inv_txfm_add_32x32
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
int
eob
,
TX_TYPE
tx_type
);
void
inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
);
void
av1_
inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
);
#if CONFIG_AOM_HIGHBITDEPTH
void
av1_highbd_iwht4x4_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
int
eob
,
int
bd
);
...
...
@@ -104,8 +104,8 @@ void av1_highbd_inv_txfm_add_16x16(const tran_low_t *input, uint8_t *dest,
void
av1_highbd_inv_txfm_add_32x32
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
int
eob
,
int
bd
,
TX_TYPE
tx_type
);
void
highbd_inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
);
void
av1_
highbd_inv_txfm_add
(
const
tran_low_t
*
input
,
uint8_t
*
dest
,
int
stride
,
INV_TXFM_PARAM
*
inv_txfm_param
);
#endif // CONFIG_AOM_HIGHBITDEPTH
#ifdef __cplusplus
}
// extern "C"
...
...
av1/decoder/decodeframe.c
View file @
bb9c73b0
...
...
@@ -336,10 +336,10 @@ static void inverse_transform_block(MACROBLOCKD *xd, int plane,
#if CONFIG_AOM_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
inv_txfm_param
.
bd
=
xd
->
bd
;
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
stride
,
&
inv_txfm_param
);
av1_
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
stride
,
&
inv_txfm_param
);
}
else
{
#endif // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add
(
dqcoeff
,
dst
,
stride
,
&
inv_txfm_param
);
av1_
inv_txfm_add
(
dqcoeff
,
dst
,
stride
,
&
inv_txfm_param
);
#if CONFIG_AOM_HIGHBITDEPTH
}
#endif // CONFIG_AOM_HIGHBITDEPTH
...
...
av1/encoder/encodemb.c
View file @
bb9c73b0
...
...
@@ -753,11 +753,11 @@ static void encode_block(int plane, int block, int blk_row, int blk_col,
#if CONFIG_AOM_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
inv_txfm_param
.
bd
=
xd
->
bd
;
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
&
inv_txfm_param
);
av1_
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
&
inv_txfm_param
);
return
;
}
#endif // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
&
inv_txfm_param
);
av1_
inv_txfm_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
&
inv_txfm_param
);
}
#if CONFIG_VAR_TX
...
...
@@ -1078,12 +1078,12 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
#if CONFIG_AOM_HIGHBITDEPTH
inv_txfm_param
.
bd
=
xd
->
bd
;
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
av1_
highbd_inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
}
else
{
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
av1_
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
}
#else
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
av1_
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
#endif // CONFIG_AOM_HIGHBITDEPTH
*
(
args
->
skip
)
=
0
;
...
...
@@ -1124,7 +1124,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
#error
#else
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
av1_
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
#endif
#endif // #if !CONFIG_PVQ
...
...
av1/encoder/rdopt.c
View file @
bb9c73b0
...
...
@@ -1336,7 +1336,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block,
inv_txfm_param.bd = xd->bd;
aom_highbd_convolve_copy(dst, dst_stride, recon, MAX_TX_SIZE, NULL, 0,
NULL, 0, bsw, bsh, xd->bd);
highbd_inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
av1_
highbd_inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
} else
#endif // CONFIG_AOM_HIGHBITDEPTH
{
...
...
@@ -1349,7 +1349,7 @@ static void dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane, int block,
for (j = 0; j < bsh; j++)
for (i = 0; i < bsw; i++) recon[j * MAX_TX_SIZE + i] = 0;
#endif // !CONFIG_PVQ
inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
av1_
inv_txfm_add(dqcoeff, recon, MAX_TX_SIZE, &inv_txfm_param);
}
#if CONFIG_DAALA_DIST
if (plane == 0) {
...
...
@@ -1451,7 +1451,7 @@ static void block_rd_txfm(int plane, int block, int blk_row, int blk_col,
&this_rd_stats.dist, &this_rd_stats.sse);
} else {
// Note that the encode block_intra call above already calls
// inv_txfm_add, so we can't just call dist_block here.
//
av1_
inv_txfm_add, so we can't just call dist_block here.
const BLOCK_SIZE tx_bsize = txsize_to_bsize[tx_size];
const aom_variance_fn_t variance = args->cpi->fn_ptr[tx_bsize].vf;
const struct macroblock_plane *const p = &x->plane[plane];
...
...
@@ -3894,12 +3894,13 @@ void av1_tx_block_rd_b(const AV1_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
#if CONFIG_AOM_HIGHBITDEPTH
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
inv_txfm_param.bd = xd->bd;
highbd_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
av1_highbd_inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE,
&inv_txfm_param);
} else {
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
av1_
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
}
#else // CONFIG_AOM_HIGHBITDEPTH
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
av1_
inv_txfm_add(dqcoeff, rec_buffer, MAX_TX_SIZE, &inv_txfm_param);
#endif // CONFIG_AOM_HIGHBITDEPTH
if (txb_w + blk_col > max_blocks_wide ||
...
...
@@ -6638,7 +6639,7 @@ static int64_t rd_pick_inter_best_sub8x8_mode(
for (i2 = 0; i2 < 4; i2++) dst[j2 * dst_stride + i2] = 0;
}
#endif // CONFIG_PVQ
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
av1_
inv_txfm_add(dqcoeff, dst, dst_stride, &inv_txfm_param);
}
}
}
...
...
Write
Preview
Markdown
is supported
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