Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f3efb990
Commit
f3efb990
authored
Nov 05, 2013
by
Jingning Han
Committed by
Gerrit Code Review
Nov 05, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix the use case of plane_block_idx in sub8x8 RD"
parents
4fc8320f
4efa6a01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+2
-2
No files found.
vp9/encoder/vp9_rdopt.c
View file @
f3efb990
...
...
@@ -1092,7 +1092,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib,
else
x
->
fwd_txm4x4
(
src_diff
,
coeff
,
8
);
vp9_regular_quantize_b_4x4
(
x
,
16
,
block
,
scan
,
get_iscan_4x4
(
tx_type
));
vp9_regular_quantize_b_4x4
(
x
,
4
,
block
,
scan
,
get_iscan_4x4
(
tx_type
));
ratey
+=
cost_coeffs
(
x
,
0
,
block
,
tempa
+
idx
,
templ
+
idy
,
TX_4X4
,
scan
,
nb
);
...
...
@@ -1559,7 +1559,7 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi,
coeff
=
BLOCK_OFFSET
(
p
->
coeff
,
k
);
x
->
fwd_txm4x4
(
raster_block_offset_int16
(
BLOCK_8X8
,
k
,
p
->
src_diff
),
coeff
,
8
);
vp9_regular_quantize_b_4x4
(
x
,
16
,
k
,
get_scan_4x4
(
DCT_DCT
),
vp9_regular_quantize_b_4x4
(
x
,
4
,
k
,
get_scan_4x4
(
DCT_DCT
),
get_iscan_4x4
(
DCT_DCT
));
thisdistortion
+=
vp9_block_error
(
coeff
,
BLOCK_OFFSET
(
pd
->
dqcoeff
,
k
),
16
,
&
ssz
);
...
...
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