Skip to content
GitLab
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
5509b7fd
Commit
5509b7fd
authored
Aug 15, 2014
by
Dmitry Kovalev
Browse files
Removing duplicated code from init_config().
Change-Id: I50f4485cfbdaadc3084aa5bc63bf3a2f15a0d903
parent
fa8de273
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encoder.c
View file @
5509b7fd
...
...
@@ -451,7 +451,7 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) {
"Failed to allocate scaled last source buffer"
);
}
void
vp9_
alloc_compressor_data
(
VP9_COMP
*
cpi
)
{
static
void
alloc_compressor_data
(
VP9_COMP
*
cpi
)
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
vp9_alloc_context_buffers
(
cm
,
cm
->
width
,
cm
->
height
);
...
...
@@ -463,7 +463,7 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
CHECK_MEM_ERROR
(
cm
,
cpi
->
tok
,
vpx_calloc
(
tokens
,
sizeof
(
*
cpi
->
tok
)));
}
vp9_setup_pc_tree
(
&
cpi
->
common
,
cpi
);
vp9_setup_pc_tree
(
cm
,
cpi
);
}
static
void
update_frame_size
(
VP9_COMP
*
cpi
)
{
...
...
@@ -519,18 +519,17 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
cpi
->
oxcf
=
*
oxcf
;
cpi
->
framerate
=
oxcf
->
init_framerate
;
cpi
->
static_mb_pct
=
0
;
cpi
->
ref_frame_flags
=
0
;
cm
->
profile
=
oxcf
->
profile
;
cm
->
bit_depth
=
oxcf
->
bit_depth
;
cm
->
color_space
=
UNKNOWN
;
cm
->
width
=
oxcf
->
width
;
cm
->
height
=
oxcf
->
height
;
vp9_
alloc_compressor_data
(
cpi
);
alloc_compressor_data
(
cpi
);
// Spatial scalability.
cpi
->
svc
.
number_spatial_layers
=
oxcf
->
ss_number_layers
;
// Temporal scalability.
cpi
->
svc
.
number_temporal_layers
=
oxcf
->
ts_number_layers
;
if
((
cpi
->
svc
.
number_temporal_layers
>
1
&&
...
...
@@ -540,23 +539,14 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
vp9_init_layer_context
(
cpi
);
}
// change includes all joint functionality
vp9_change_config
(
cpi
,
oxcf
);
cpi
->
static_mb_pct
=
0
;
cpi
->
ref_frame_flags
=
0
;
init_buffer_indices
(
cpi
);
set_tile_limits
(
cpi
);
}
void
vp9_change_config
(
struct
VP9_COMP
*
cpi
,
const
VP9EncoderConfig
*
oxcf
)
{
VP9_COMMON
*
const
cm
=
&
cpi
->
common
;
RATE_CONTROL
*
const
rc
=
&
cpi
->
rc
;
if
(
cm
->
profile
!=
oxcf
->
profile
)
cm
->
profile
=
oxcf
->
profile
;
cm
->
profile
=
oxcf
->
profile
;
cm
->
bit_depth
=
oxcf
->
bit_depth
;
if
(
cm
->
profile
<=
PROFILE_1
)
...
...
vp9/encoder/vp9_encoder.h
View file @
5509b7fd
...
...
@@ -514,8 +514,6 @@ static INLINE int get_token_alloc(int mb_rows, int mb_cols) {
int
vp9_get_y_sse
(
const
YV12_BUFFER_CONFIG
*
a
,
const
YV12_BUFFER_CONFIG
*
b
);
void
vp9_alloc_compressor_data
(
VP9_COMP
*
cpi
);
void
vp9_scale_references
(
VP9_COMP
*
cpi
);
void
vp9_update_reference_frames
(
VP9_COMP
*
cpi
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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