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
3c8e04e9
Commit
3c8e04e9
authored
Sep 16, 2015
by
Ronald S. Bultje
Committed by
Gerrit Code Review
Sep 16, 2015
Browse files
Merge "vp10: don't reset contextual skip flag if block has no coefficients."
parents
62327916
a5d930e4
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp10/common/blockd.h
View file @
3c8e04e9
...
...
@@ -70,6 +70,9 @@ typedef struct {
PREDICTION_MODE
mode
;
TX_SIZE
tx_size
;
int8_t
skip
;
#if CONFIG_MISC_FIXES
int8_t
has_no_coeffs
;
#endif
int8_t
segment_id
;
int8_t
seg_id_predicted
;
// valid only when temporal_update is enabled
...
...
vp10/common/loopfilter.c
View file @
3c8e04e9
...
...
@@ -754,8 +754,13 @@ static void build_masks(const loop_filter_info_n *const lfi_n,
// If the block has no coefficients and is not intra we skip applying
// the loop filter on block edges.
#if CONFIG_MISC_FIXES
if
((
mbmi
->
skip
||
mbmi
->
has_no_coeffs
)
&&
is_inter_block
(
mbmi
))
return
;
#else
if
(
mbmi
->
skip
&&
is_inter_block
(
mbmi
))
return
;
#endif
// Here we are adding a mask for the transform size. The transform
// size mask is set to be correct for a 64x64 prediction block size. We
...
...
@@ -812,8 +817,13 @@ static void build_y_mask(const loop_filter_info_n *const lfi_n,
*
above_y
|=
above_prediction_mask
[
block_size
]
<<
shift_y
;
*
left_y
|=
left_prediction_mask
[
block_size
]
<<
shift_y
;
#if CONFIG_MISC_FIXES
if
((
mbmi
->
skip
||
mbmi
->
has_no_coeffs
)
&&
is_inter_block
(
mbmi
))
return
;
#else
if
(
mbmi
->
skip
&&
is_inter_block
(
mbmi
))
return
;
#endif
*
above_y
|=
(
size_mask
[
block_size
]
&
above_64x64_txform_mask
[
tx_size_y
])
<<
shift_y
;
...
...
vp10/decoder/decodeframe.c
View file @
3c8e04e9
...
...
@@ -858,7 +858,11 @@ static void decode_block(VP10Decoder *const pbi, MACROBLOCKD *const xd,
}
if
(
!
less8x8
&&
eobtotal
==
0
)
#if CONFIG_MISC_FIXES
mbmi
->
has_no_coeffs
=
1
;
// skip loopfilter
#else
mbmi
->
skip
=
1
;
// skip loopfilter
#endif
}
}
...
...
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