Skip to content
GitLab
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
ab829274
Commit
ab829274
authored
Oct 16, 2013
by
Dmitry Kovalev
Browse files
Inlining and removing fwd_txm16x16 and fwd_txm8x8 pointers.
Change-Id: I3528ba1c3fee761918509f9d9dc2d842c69f5a44
parent
ba71191c
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_block.h
View file @
ab829274
...
...
@@ -173,8 +173,6 @@ struct macroblock {
BLOCK_SIZE
sb64_partitioning
;
void
(
*
fwd_txm4x4
)(
int16_t
*
input
,
int16_t
*
output
,
int
pitch
);
void
(
*
fwd_txm8x8
)(
int16_t
*
input
,
int16_t
*
output
,
int
pitch
);
void
(
*
fwd_txm16x16
)(
int16_t
*
input
,
int16_t
*
output
,
int
pitch
);
void
(
*
quantize_b_4x4
)(
MACROBLOCK
*
x
,
int
b_idx
,
TX_TYPE
tx_type
,
int
y_blocks
);
};
...
...
vp9/encoder/vp9_encodemb.c
View file @
ab829274
...
...
@@ -379,7 +379,7 @@ void vp9_xform_quant(int plane, int block, BLOCK_SIZE plane_bsize,
xoff
=
16
*
(
block
&
twmask
);
yoff
=
16
*
(
block
>>
twl
);
src_diff
=
p
->
src_diff
+
4
*
bw
*
yoff
+
xoff
;
x
->
fwd_txm
16x16
(
src_diff
,
coeff
,
bw
*
8
);
vp9_short_fdct
16x16
(
src_diff
,
coeff
,
bw
*
8
);
vp9_quantize_b
(
coeff
,
256
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
@@ -391,7 +391,7 @@ void vp9_xform_quant(int plane, int block, BLOCK_SIZE plane_bsize,
xoff
=
8
*
(
block
&
twmask
);
yoff
=
8
*
(
block
>>
twl
);
src_diff
=
p
->
src_diff
+
4
*
bw
*
yoff
+
xoff
;
x
->
fwd_txm
8x8
(
src_diff
,
coeff
,
bw
*
8
);
vp9_short_fdct
8x8
(
src_diff
,
coeff
,
bw
*
8
);
vp9_quantize_b
(
coeff
,
64
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
@@ -559,7 +559,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
if
(
tx_type
!=
DCT_DCT
)
vp9_short_fht16x16
(
src_diff
,
coeff
,
bw
*
4
,
tx_type
);
else
x
->
fwd_txm
16x16
(
src_diff
,
coeff
,
bw
*
8
);
vp9_short_fdct
16x16
(
src_diff
,
coeff
,
bw
*
8
);
vp9_quantize_b
(
coeff
,
256
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
@@ -584,7 +584,7 @@ void vp9_encode_block_intra(int plane, int block, BLOCK_SIZE plane_bsize,
if
(
tx_type
!=
DCT_DCT
)
vp9_short_fht8x8
(
src_diff
,
coeff
,
bw
*
4
,
tx_type
);
else
x
->
fwd_txm
8x8
(
src_diff
,
coeff
,
bw
*
8
);
vp9_short_fdct
8x8
(
src_diff
,
coeff
,
bw
*
8
);
vp9_quantize_b
(
coeff
,
64
,
x
->
skip_block
,
p
->
zbin
,
p
->
round
,
p
->
quant
,
p
->
quant_shift
,
qcoeff
,
dqcoeff
,
pd
->
dequant
,
p
->
zbin_extra
,
eob
,
scan
,
iscan
);
...
...
vp9/encoder/vp9_onyx_if.c
View file @
ab829274
...
...
@@ -957,8 +957,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf
->
optimize_coefficients
=
0
;
}
cpi
->
mb
.
fwd_txm16x16
=
vp9_short_fdct16x16
;
cpi
->
mb
.
fwd_txm8x8
=
vp9_short_fdct8x8
;
cpi
->
mb
.
fwd_txm4x4
=
vp9_short_fdct4x4
;
if
(
cpi
->
oxcf
.
lossless
||
cpi
->
mb
.
e_mbd
.
lossless
)
{
cpi
->
mb
.
fwd_txm4x4
=
vp9_short_walsh4x4
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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