Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
04cb4938
Commit
04cb4938
authored
Mar 03, 2016
by
Jingning Han
Committed by
Gerrit Code Review
Mar 03, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Properly restore transform block skip flag in RD search" into nextgenv2
parents
6231b6b0
7174d637
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
2 deletions
+21
-2
vp10/encoder/block.h
vp10/encoder/block.h
+3
-0
vp10/encoder/encodeframe.c
vp10/encoder/encodeframe.c
+3
-0
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+15
-2
No files found.
vp10/encoder/block.h
View file @
04cb4938
...
...
@@ -143,6 +143,9 @@ struct macroblock {
uint8_t
zcoeff_blk
[
TX_SIZES
][
256
];
#if CONFIG_VAR_TX
uint8_t
blk_skip
[
MAX_MB_PLANE
][
256
];
#if CONFIG_REF_MV
uint8_t
blk_skip_drl
[
MAX_MB_PLANE
][
256
];
#endif
#endif
int
skip
;
...
...
vp10/encoder/encodeframe.c
View file @
04cb4938
...
...
@@ -3987,6 +3987,9 @@ static void encode_frame_internal(VP10_COMP *cpi) {
vp10_zero
(
x
->
skip_txfm
);
#if CONFIG_VAR_TX
vp10_zero
(
x
->
blk_skip
);
#if CONFIG_REF_MV
vp10_zero
(
x
->
blk_skip_drl
);
#endif
#endif
{
...
...
vp10/encoder/rdopt.c
View file @
04cb4938
...
...
@@ -7208,6 +7208,11 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
rate_y
-
rate_uv
,
total_sse
);
}
#if CONFIG_VAR_TX
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
++
i
)
memcpy
(
x
->
blk_skip_drl
[
i
],
x
->
blk_skip
[
i
],
sizeof
(
uint8_t
)
*
ctx
->
num_4x4_blk
);
#endif
for
(
ref_idx
=
0
;
ref_idx
<
ref_set
;
++
ref_idx
)
{
int64_t
tmp_alt_rd
=
INT64_MAX
;
...
...
@@ -7235,8 +7240,6 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
#else
int_mv
dummy_single_newmv
[
MAX_REF_FRAMES
]
=
{
{
0
}
};
#endif
mbmi
->
ref_mv_idx
=
1
+
ref_idx
;
frame_mv
[
NEARMV
][
ref_frame
]
=
cur_mv
;
...
...
@@ -7299,12 +7302,22 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
this_rd
=
tmp_alt_rd
;
tmp_ref_rd
=
tmp_alt_rd
;
backup_mbmi
=
*
mbmi
;
#if CONFIG_VAR_TX
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
++
i
)
memcpy
(
x
->
blk_skip_drl
[
i
],
x
->
blk_skip
[
i
],
sizeof
(
uint8_t
)
*
ctx
->
num_4x4_blk
);
#endif
}
else
{
*
mbmi
=
backup_mbmi
;
}
}
frame_mv
[
NEARMV
][
ref_frame
]
=
backup_mv
;
#if CONFIG_VAR_TX
for
(
i
=
0
;
i
<
MAX_MB_PLANE
;
++
i
)
memcpy
(
x
->
blk_skip
[
i
],
x
->
blk_skip_drl
[
i
],
sizeof
(
uint8_t
)
*
ctx
->
num_4x4_blk
);
#endif
}
#endif // CONFIG_REF_MV
...
...
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