Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
external
libvpx
Commits
6cd25413
Commit
6cd25413
authored
Nov 02, 2012
by
Ronald S. Bultje
Browse files
Don't generate residual 3x when doing a macroblock luma RD estimate.
Change-Id: Ia601e96fcb4fc547884b6ab894f9f2ad22a98078
parent
3c4f47e8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
10 deletions
+3
-10
vp9/encoder/rdopt.c
vp9/encoder/rdopt.c
+3
-10
No files found.
vp9/encoder/rdopt.c
View file @
6cd25413
...
...
@@ -651,9 +651,6 @@ static void macro_block_yrd_4x4(MACROBLOCK *mb,
BLOCK
*
beptr
;
int
d
;
vp9_subtract_mby
(
mb
->
src_diff
,
*
(
mb
->
block
[
0
].
base_src
),
xd
->
predictor
,
mb
->
block
[
0
].
src_stride
);
// Fdct and building the 2nd order block
for
(
beptr
=
mb
->
block
;
beptr
<
mb
->
block
+
16
;
beptr
+=
2
)
{
mb
->
vp9_short_fdct8x4
(
beptr
->
src_diff
,
beptr
->
coeff
,
32
);
...
...
@@ -722,9 +719,6 @@ static void macro_block_yrd_8x8(MACROBLOCK *mb,
BLOCKD
*
const
x_y2
=
xd
->
block
+
24
;
int
d
;
vp9_subtract_mby
(
mb
->
src_diff
,
*
(
mb
->
block
[
0
].
base_src
),
xd
->
predictor
,
mb
->
block
[
0
].
src_stride
);
vp9_transform_mby_8x8
(
mb
);
vp9_quantize_mby_8x8
(
mb
);
...
...
@@ -771,9 +765,6 @@ static void macro_block_yrd_16x16(MACROBLOCK *mb, int *Rate, int *Distortion,
BLOCK
*
be
=
&
mb
->
block
[
0
];
TX_TYPE
tx_type
;
vp9_subtract_mby
(
mb
->
src_diff
,
*
(
mb
->
block
[
0
].
base_src
),
mb
->
e_mbd
.
predictor
,
mb
->
block
[
0
].
src_stride
);
tx_type
=
get_tx_type_16x16
(
xd
,
b
);
if
(
tx_type
!=
DCT_DCT
)
{
vp9_fht
(
be
->
src_diff
,
32
,
be
->
coeff
,
tx_type
,
16
);
...
...
@@ -810,7 +801,9 @@ static void macro_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate,
int
d16x16
,
r16x16
,
r16x16s
,
s16x16
;
int64_t
rd16x16
,
rd16x16s
;
// FIXME don't do sub x3
vp9_subtract_mby
(
x
->
src_diff
,
*
(
x
->
block
[
0
].
base_src
),
xd
->
predictor
,
x
->
block
[
0
].
src_stride
);
if
(
skip_prob
==
0
)
skip_prob
=
1
;
s0
=
vp9_cost_bit
(
skip_prob
,
0
);
...
...
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