Commit 37d7cb60 authored by Adrian Grange's avatar Adrian Grange

Remove unnecessary local variables.

Change-Id: I1cdcd847f258967534ef30ba15894b486f1519a8
parent 6adaec4f
...@@ -888,10 +888,9 @@ static const vpx_codec_cx_pkt_t *vp9e_get_cxdata(vpx_codec_alg_priv_t *ctx, ...@@ -888,10 +888,9 @@ static const vpx_codec_cx_pkt_t *vp9e_get_cxdata(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t vp9e_set_reference(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp9e_set_reference(vpx_codec_alg_priv_t *ctx,
int ctr_id, int ctr_id,
va_list args) { va_list args) {
vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *); vpx_ref_frame_t *frame = va_arg(args, vpx_ref_frame_t *);
if (data) { if (frame != NULL) {
vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data;
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
...@@ -906,10 +905,9 @@ static vpx_codec_err_t vp9e_set_reference(vpx_codec_alg_priv_t *ctx, ...@@ -906,10 +905,9 @@ static vpx_codec_err_t vp9e_set_reference(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t vp9e_copy_reference(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp9e_copy_reference(vpx_codec_alg_priv_t *ctx,
int ctr_id, int ctr_id,
va_list args) { va_list args) {
vpx_ref_frame_t *data = va_arg(args, vpx_ref_frame_t *); vpx_ref_frame_t *frame = va_arg(args, vpx_ref_frame_t *);
if (data) { if (frame != NULL) {
vpx_ref_frame_t *frame = (vpx_ref_frame_t *)data;
YV12_BUFFER_CONFIG sd; YV12_BUFFER_CONFIG sd;
image2yuvconfig(&frame->img, &sd); image2yuvconfig(&frame->img, &sd);
...@@ -924,13 +922,13 @@ static vpx_codec_err_t vp9e_copy_reference(vpx_codec_alg_priv_t *ctx, ...@@ -924,13 +922,13 @@ static vpx_codec_err_t vp9e_copy_reference(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t get_reference(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t get_reference(vpx_codec_alg_priv_t *ctx,
int ctr_id, int ctr_id,
va_list args) { va_list args) {
vp9_ref_frame_t *data = va_arg(args, vp9_ref_frame_t *); vp9_ref_frame_t *frame = va_arg(args, vp9_ref_frame_t *);
if (data) { if (frame != NULL) {
YV12_BUFFER_CONFIG* fb; YV12_BUFFER_CONFIG* fb;
vp9_get_reference_enc(ctx->cpi, data->idx, &fb); vp9_get_reference_enc(ctx->cpi, frame->idx, &fb);
yuvconfig2image(&data->img, fb, NULL); yuvconfig2image(&frame->img, fb, NULL);
return VPX_CODEC_OK; return VPX_CODEC_OK;
} else { } else {
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
...@@ -941,11 +939,11 @@ static vpx_codec_err_t vp9e_set_previewpp(vpx_codec_alg_priv_t *ctx, ...@@ -941,11 +939,11 @@ static vpx_codec_err_t vp9e_set_previewpp(vpx_codec_alg_priv_t *ctx,
int ctr_id, int ctr_id,
va_list args) { va_list args) {
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
vp8_postproc_cfg_t *data = va_arg(args, vp8_postproc_cfg_t *); vp8_postproc_cfg_t *config = va_arg(args, vp8_postproc_cfg_t *);
(void)ctr_id; (void)ctr_id;
if (data) { if (config != NULL) {
ctx->preview_ppcfg = *((vp8_postproc_cfg_t *)data); ctx->preview_ppcfg = *config;
return VPX_CODEC_OK; return VPX_CODEC_OK;
} else { } else {
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
...@@ -1019,14 +1017,13 @@ static vpx_codec_err_t vp9e_set_activemap(vpx_codec_alg_priv_t *ctx, ...@@ -1019,14 +1017,13 @@ static vpx_codec_err_t vp9e_set_activemap(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t vp9e_set_scalemode(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp9e_set_scalemode(vpx_codec_alg_priv_t *ctx,
int ctr_id, int ctr_id,
va_list args) { va_list args) {
vpx_scaling_mode_t *data = va_arg(args, vpx_scaling_mode_t *); vpx_scaling_mode_t *scalemode = va_arg(args, vpx_scaling_mode_t *);
if (data) { if (scalemode != NULL) {
int res; int res;
vpx_scaling_mode_t scalemode = *(vpx_scaling_mode_t *)data;
res = vp9_set_internal_size(ctx->cpi, res = vp9_set_internal_size(ctx->cpi,
(VPX_SCALING)scalemode.h_scaling_mode, (VPX_SCALING)scalemode->h_scaling_mode,
(VPX_SCALING)scalemode.v_scaling_mode); (VPX_SCALING)scalemode->v_scaling_mode);
if (!res) { if (!res) {
return VPX_CODEC_OK; return VPX_CODEC_OK;
...@@ -1073,29 +1070,23 @@ static vpx_codec_err_t vp9e_set_svc_layer_id(vpx_codec_alg_priv_t *ctx, ...@@ -1073,29 +1070,23 @@ static vpx_codec_err_t vp9e_set_svc_layer_id(vpx_codec_alg_priv_t *ctx,
static vpx_codec_err_t vp9e_set_svc_parameters(vpx_codec_alg_priv_t *ctx, static vpx_codec_err_t vp9e_set_svc_parameters(vpx_codec_alg_priv_t *ctx,
int ctr_id, va_list args) { int ctr_id, va_list args) {
vpx_svc_parameters_t *data = va_arg(args, vpx_svc_parameters_t *);
VP9_COMP *cpi = (VP9_COMP *)ctx->cpi; VP9_COMP *cpi = (VP9_COMP *)ctx->cpi;
vpx_svc_parameters_t params; vpx_svc_parameters_t *params = va_arg(args, vpx_svc_parameters_t *);
if (data == NULL) { if (params == NULL) return VPX_CODEC_INVALID_PARAM;
return VPX_CODEC_INVALID_PARAM;
}
params = *(vpx_svc_parameters_t *)data; cpi->svc.spatial_layer_id = params->spatial_layer;
cpi->svc.temporal_layer_id = params->temporal_layer;
cpi->svc.spatial_layer_id = params.spatial_layer; cpi->lst_fb_idx = params->lst_fb_idx;
cpi->svc.temporal_layer_id = params.temporal_layer; cpi->gld_fb_idx = params->gld_fb_idx;
cpi->alt_fb_idx = params->alt_fb_idx;
cpi->lst_fb_idx = params.lst_fb_idx; if (vp9_set_size_literal(ctx->cpi, params->width, params->height) != 0)
cpi->gld_fb_idx = params.gld_fb_idx;
cpi->alt_fb_idx = params.alt_fb_idx;
if (vp9_set_size_literal(ctx->cpi, params.width, params.height) != 0) {
return VPX_CODEC_INVALID_PARAM; return VPX_CODEC_INVALID_PARAM;
}
ctx->cfg.rc_max_quantizer = params.max_quantizer; ctx->cfg.rc_max_quantizer = params->max_quantizer;
ctx->cfg.rc_min_quantizer = params.min_quantizer; ctx->cfg.rc_min_quantizer = params->min_quantizer;
set_vp9e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg); set_vp9e_config(&ctx->oxcf, ctx->cfg, ctx->vp8_cfg);
vp9_change_config(ctx->cpi, &ctx->oxcf); vp9_change_config(ctx->cpi, &ctx->oxcf);
......
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