Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
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
55977e4a
Commit
55977e4a
authored
Apr 15, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Apr 15, 2014
Browse files
Merge "Moving frame_frags field from VP9Common to VP9_COMP."
parents
e58ea39f
1d5ed021
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_onyxc_int.h
View file @
55977e4a
...
...
@@ -120,7 +120,6 @@ typedef struct VP9Common {
// frame header, 3 reset all contexts.
int
reset_frame_context
;
int
frame_flags
;
// MBs, mb_rows/cols is in 16-pixel units; mi_rows/cols is in
// MODE_INFO (8-pixel) units.
int
MBs
;
...
...
vp9/encoder/vp9_firstpass.c
View file @
55977e4a
...
...
@@ -2180,7 +2180,7 @@ void vp9_rc_get_first_pass_params(VP9_COMP *cpi) {
VP9_COMMON
*
const
cm
=
&
cpi
->
common
;
if
(
!
cpi
->
refresh_alt_ref_frame
&&
(
cm
->
current_video_frame
==
0
||
(
c
m
->
frame_flags
&
FRAMEFLAGS_KEY
)))
{
(
c
pi
->
frame_flags
&
FRAMEFLAGS_KEY
)))
{
cm
->
frame_type
=
KEY_FRAME
;
}
else
{
cm
->
frame_type
=
INTER_FRAME
;
...
...
@@ -2250,7 +2250,7 @@ void vp9_rc_get_second_pass_params(VP9_COMP *cpi) {
// Keyframe and section processing.
if
(
rc
->
frames_to_key
==
0
||
(
c
m
->
frame_flags
&
FRAMEFLAGS_KEY
))
{
(
c
pi
->
frame_flags
&
FRAMEFLAGS_KEY
))
{
// Define next KF group and assign bits to it.
this_frame_copy
=
this_frame
;
find_next_key_frame
(
cpi
,
&
this_frame_copy
);
...
...
vp9/encoder/vp9_onyx_if.c
View file @
55977e4a
...
...
@@ -2599,14 +2599,14 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
output_frame_level_debug_stats(cpi);
#endif
if
(
cpi
->
refresh_golden_frame
==
1
)
c
m
->
frame_flags
|=
FRAMEFLAGS_GOLDEN
;
c
pi
->
frame_flags
|=
FRAMEFLAGS_GOLDEN
;
else
c
m
->
frame_flags
&=
~
FRAMEFLAGS_GOLDEN
;
c
pi
->
frame_flags
&=
~
FRAMEFLAGS_GOLDEN
;
if
(
cpi
->
refresh_alt_ref_frame
==
1
)
c
m
->
frame_flags
|=
FRAMEFLAGS_ALTREF
;
c
pi
->
frame_flags
|=
FRAMEFLAGS_ALTREF
;
else
c
m
->
frame_flags
&=
~
FRAMEFLAGS_ALTREF
;
c
pi
->
frame_flags
&=
~
FRAMEFLAGS_ALTREF
;
get_ref_frame_flags
(
cpi
);
...
...
@@ -2615,7 +2615,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
if
(
cm
->
frame_type
==
KEY_FRAME
)
{
// Tell the caller that the frame was coded as a key frame
*
frame_flags
=
c
m
->
frame_flags
|
FRAMEFLAGS_KEY
;
*
frame_flags
=
c
pi
->
frame_flags
|
FRAMEFLAGS_KEY
;
#if CONFIG_MULTIPLE_ARF
// Reset the sequence number.
...
...
@@ -2626,7 +2626,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
}
#endif
}
else
{
*
frame_flags
=
c
m
->
frame_flags
&
~
FRAMEFLAGS_KEY
;
*
frame_flags
=
c
pi
->
frame_flags
&
~
FRAMEFLAGS_KEY
;
#if CONFIG_MULTIPLE_ARF
/* Increment position in the coded frame sequence. */
...
...
@@ -2995,7 +2995,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
}
#endif
c
m
->
frame_flags
=
*
frame_flags
;
c
pi
->
frame_flags
=
*
frame_flags
;
if
(
cpi
->
pass
==
2
&&
cm
->
current_video_frame
==
0
&&
...
...
vp9/encoder/vp9_onyx_int.h
View file @
55977e4a
...
...
@@ -508,6 +508,8 @@ typedef struct VP9_COMP {
int
use_large_partition_rate
;
int
frame_flags
;
#if CONFIG_MULTIPLE_ARF
// ARF tracking variables.
int
multi_arf_enabled
;
...
...
vp9/encoder/vp9_ratectrl.c
View file @
55977e4a
...
...
@@ -1226,7 +1226,7 @@ void vp9_rc_get_one_pass_vbr_params(VP9_COMP *cpi) {
int
target
;
if
(
!
cpi
->
refresh_alt_ref_frame
&&
(
cm
->
current_video_frame
==
0
||
(
c
m
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
(
c
pi
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
rc
->
frames_to_key
==
0
||
(
cpi
->
oxcf
.
auto_key
&&
test_for_kf_one_pass
(
cpi
))))
{
cm
->
frame_type
=
KEY_FRAME
;
...
...
@@ -1318,7 +1318,7 @@ void vp9_rc_get_svc_params(VP9_COMP *cpi) {
RATE_CONTROL
*
const
rc
=
&
cpi
->
rc
;
int
target
=
rc
->
av_per_frame_bandwidth
;
if
((
cm
->
current_video_frame
==
0
)
||
(
c
m
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
(
c
pi
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
(
cpi
->
oxcf
.
auto_key
&&
(
rc
->
frames_since_key
%
cpi
->
key_frame_frequency
==
0
)))
{
cm
->
frame_type
=
KEY_FRAME
;
...
...
@@ -1342,7 +1342,7 @@ void vp9_rc_get_one_pass_cbr_params(VP9_COMP *cpi) {
RATE_CONTROL
*
const
rc
=
&
cpi
->
rc
;
int
target
;
if
((
cm
->
current_video_frame
==
0
||
(
c
m
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
(
c
pi
->
frame_flags
&
FRAMEFLAGS_KEY
)
||
rc
->
frames_to_key
==
0
||
(
cpi
->
oxcf
.
auto_key
&&
test_for_kf_one_pass
(
cpi
))))
{
cm
->
frame_type
=
KEY_FRAME
;
...
...
Write
Preview
Supports
Markdown
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