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
70d12c3a
Commit
70d12c3a
authored
Apr 30, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Apr 30, 2013
Browse files
Merge "Renaming refresh_entropy_probs to refresh_frame_context." into experimental
parents
51a73fbb
9713a687
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_onyxc_int.h
View file @
70d12c3a
...
...
@@ -248,7 +248,7 @@ typedef struct VP9Common {
int
sharpness_level
;
int
dering_enabled
;
int
refresh_
entropy_probs
;
/* Two state 0 = NO, 1 = YES */
int
refresh_
frame_context
;
/* Two state 0 = NO, 1 = YES */
int
ref_frame_sign_bias
[
MAX_REF_FRAMES
];
/* Two state 0, 1 */
...
...
vp9/decoder/vp9_decodframe.c
View file @
70d12c3a
...
...
@@ -1391,10 +1391,10 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
}
if
(
!
pc
->
error_resilient_mode
)
{
pc
->
refresh_
entropy_probs
=
vp9_read_bit
(
&
header_bc
);
pc
->
refresh_
frame_context
=
vp9_read_bit
(
&
header_bc
);
pc
->
frame_parallel_decoding_mode
=
vp9_read_bit
(
&
header_bc
);
}
else
{
pc
->
refresh_
entropy_probs
=
0
;
pc
->
refresh_
frame_context
=
0
;
pc
->
frame_parallel_decoding_mode
=
1
;
}
...
...
@@ -1486,7 +1486,7 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
}
#endif
if
(
pc
->
refresh_
entropy_probs
)
if
(
pc
->
refresh_
frame_context
)
pc
->
frame_contexts
[
pc
->
frame_context_idx
]
=
pc
->
fc
;
*
p_data_end
=
vp9_reader_find_end
(
&
residual_bc
);
...
...
vp9/encoder/vp9_bitstream.c
View file @
70d12c3a
...
...
@@ -1975,7 +1975,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest,
}
if
(
!
pc
->
error_resilient_mode
)
{
vp9_write_bit
(
&
header_bc
,
pc
->
refresh_
entropy_probs
);
vp9_write_bit
(
&
header_bc
,
pc
->
refresh_
frame_context
);
vp9_write_bit
(
&
header_bc
,
pc
->
frame_parallel_decoding_mode
);
}
...
...
vp9/encoder/vp9_onyx_if.c
View file @
70d12c3a
...
...
@@ -1207,7 +1207,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
// cpi->use_last_frame_only = 0;
cpi
->
refresh_golden_frame
=
0
;
cpi
->
refresh_last_frame
=
1
;
cm
->
refresh_
entropy_probs
=
1
;
cm
->
refresh_
frame_context
=
1
;
setup_features
(
cpi
);
cpi
->
mb
.
e_mbd
.
allow_high_precision_mv
=
0
;
// Default mv precision adaptation
...
...
@@ -2137,10 +2137,7 @@ int vp9_set_reference_enc(VP9_PTR ptr, VP9_REFFRAME ref_frame_flag,
return
0
;
}
int
vp9_update_entropy
(
VP9_PTR
comp
,
int
update
)
{
VP9_COMP
*
cpi
=
(
VP9_COMP
*
)
comp
;
VP9_COMMON
*
cm
=
&
cpi
->
common
;
cm
->
refresh_entropy_probs
=
update
;
((
VP9_COMP
*
)
comp
)
->
common
.
refresh_frame_context
=
update
;
return
0
;
}
...
...
@@ -2753,7 +2750,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
(
cpi
->
oxcf
.
frame_parallel_decoding_mode
!=
0
);
if
(
cm
->
error_resilient_mode
)
{
cm
->
frame_parallel_decoding_mode
=
1
;
cm
->
refresh_
entropy_probs
=
0
;
cm
->
refresh_
frame_context
=
0
;
}
}
...
...
@@ -3735,7 +3732,7 @@ static int frame_is_reference(const VP9_COMP *cpi) {
cpi
->
refresh_last_frame
||
cpi
->
refresh_golden_frame
||
cpi
->
refresh_alt_ref_frame
||
cm
->
refresh_
entropy_probs
||
cm
->
refresh_
frame_context
||
mb
->
mode_ref_lf_delta_update
||
mb
->
update_mb_segmentation_map
||
mb
->
update_mb_segmentation_data
;
...
...
@@ -4005,17 +4002,15 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
encode_frame_to_data_rate
(
cpi
,
size
,
dest
,
frame_flags
);
}
if
(
cm
->
refresh_entropy_probs
)
{
vpx_memcpy
(
&
cm
->
frame_contexts
[
cm
->
frame_context_idx
],
&
cm
->
fc
,
sizeof
(
cm
->
fc
));
}
if
(
cm
->
refresh_frame_context
)
cm
->
frame_contexts
[
cm
->
frame_context_idx
]
=
cm
->
fc
;
if
(
*
size
>
0
)
{
// if its a dropped frame honor the requests on subsequent frames
cpi
->
droppable
=
!
frame_is_reference
(
cpi
);
// return to normal state
cm
->
refresh_
entropy_probs
=
1
;
cm
->
refresh_
frame_context
=
1
;
cpi
->
refresh_alt_ref_frame
=
0
;
cpi
->
refresh_golden_frame
=
0
;
cpi
->
refresh_last_frame
=
1
;
...
...
vp9/encoder/vp9_ratectrl.c
View file @
70d12c3a
...
...
@@ -262,8 +262,7 @@ void vp9_setup_inter_frame(VP9_COMP *cpi) {
vp9_setup_past_independence
(
cm
,
xd
);
assert
(
cm
->
frame_context_idx
<
NUM_FRAME_CONTEXTS
);
vpx_memcpy
(
&
cm
->
fc
,
&
cm
->
frame_contexts
[
cm
->
frame_context_idx
],
sizeof
(
cm
->
fc
));
cm
->
fc
=
cm
->
frame_contexts
[
cm
->
frame_context_idx
];
}
static
int
estimate_bits_at_q
(
int
frame_kind
,
int
q
,
int
mbs
,
...
...
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