Commit 0b8b682b authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Removing duplicated code from init_config()."

parents 49fef904 5509b7fd
...@@ -451,7 +451,7 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) { ...@@ -451,7 +451,7 @@ static void alloc_util_frame_buffers(VP9_COMP *cpi) {
"Failed to allocate scaled last source buffer"); "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_COMMON *cm = &cpi->common;
vp9_alloc_context_buffers(cm, cm->width, cm->height); vp9_alloc_context_buffers(cm, cm->width, cm->height);
...@@ -463,7 +463,7 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) { ...@@ -463,7 +463,7 @@ void vp9_alloc_compressor_data(VP9_COMP *cpi) {
CHECK_MEM_ERROR(cm, cpi->tok, vpx_calloc(tokens, sizeof(*cpi->tok))); 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) { static void update_frame_size(VP9_COMP *cpi) {
...@@ -519,18 +519,17 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) { ...@@ -519,18 +519,17 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
cpi->oxcf = *oxcf; cpi->oxcf = *oxcf;
cpi->framerate = oxcf->init_framerate; cpi->framerate = oxcf->init_framerate;
cpi->static_mb_pct = 0;
cpi->ref_frame_flags = 0;
cm->profile = oxcf->profile; cm->profile = oxcf->profile;
cm->bit_depth = oxcf->bit_depth; cm->bit_depth = oxcf->bit_depth;
cm->color_space = UNKNOWN; cm->color_space = UNKNOWN;
cm->width = oxcf->width; cm->width = oxcf->width;
cm->height = oxcf->height; cm->height = oxcf->height;
vp9_alloc_compressor_data(cpi); alloc_compressor_data(cpi);
// Spatial scalability.
cpi->svc.number_spatial_layers = oxcf->ss_number_layers; cpi->svc.number_spatial_layers = oxcf->ss_number_layers;
// Temporal scalability.
cpi->svc.number_temporal_layers = oxcf->ts_number_layers; cpi->svc.number_temporal_layers = oxcf->ts_number_layers;
if ((cpi->svc.number_temporal_layers > 1 && if ((cpi->svc.number_temporal_layers > 1 &&
...@@ -540,23 +539,14 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) { ...@@ -540,23 +539,14 @@ static void init_config(struct VP9_COMP *cpi, VP9EncoderConfig *oxcf) {
vp9_init_layer_context(cpi); vp9_init_layer_context(cpi);
} }
// change includes all joint functionality
vp9_change_config(cpi, oxcf); 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) { void vp9_change_config(struct VP9_COMP *cpi, const VP9EncoderConfig *oxcf) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
RATE_CONTROL *const rc = &cpi->rc; 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; cm->bit_depth = oxcf->bit_depth;
if (cm->profile <= PROFILE_1) if (cm->profile <= PROFILE_1)
......
...@@ -514,8 +514,6 @@ static INLINE int get_token_alloc(int mb_rows, int mb_cols) { ...@@ -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); 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_scale_references(VP9_COMP *cpi);
void vp9_update_reference_frames(VP9_COMP *cpi); void vp9_update_reference_frames(VP9_COMP *cpi);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment