ref: df083b266aac1a25044b7d43e630c51614791523
parent: eafa7126a0694a2240947bafeb51920041a0fb1f
parent: d4adf25d969765b2d9417cd52c663acaf8ae6e2d
author: Dmitry Kovalev <[email protected]>
date: Thu Aug 21 07:10:13 EDT 2014
Merge "Removing extraconfig_map from vp9_cx_iface.c."
--- a/vp9/vp9_cx_iface.c
+++ b/vp9/vp9_cx_iface.c
@@ -43,39 +43,29 @@
vp9e_tune_content content;
};
-struct extraconfig_map {- unsigned int usage;
- struct vp9_extracfg cfg;
+static struct vp9_extracfg default_extra_cfg = {+ NULL,
+ 0, // cpu_used
+ 1, // enable_auto_alt_ref
+ 0, // noise_sensitivity
+ 0, // sharpness
+ 0, // static_thresh
+ 0, // tile_columns
+ 0, // tile_rows
+ 7, // arnr_max_frames
+ 5, // arnr_strength
+ 3, // arnr_type
+ VP8_TUNE_PSNR, // tuning
+ 10, // cq_level
+ 0, // rc_max_intra_bitrate_pct
+ 0, // lossless
+ 0, // frame_parallel_decoding_mode
+ NO_AQ, // aq_mode
+ 0, // frame_periodic_delta_q
+ BITS_8, // Bit depth
+ VP9E_CONTENT_DEFAULT // content
};
-static const struct extraconfig_map extracfg_map[] = {- {- 0,
- { // NOLINT- NULL,
- 0, // cpu_used
- 1, // enable_auto_alt_ref
- 0, // noise_sensitivity
- 0, // sharpness
- 0, // static_thresh
- 0, // tile_columns
- 0, // tile_rows
- 7, // arnr_max_frames
- 5, // arnr_strength
- 3, // arnr_type
- VP8_TUNE_PSNR, // tuning
- 10, // cq_level
- 0, // rc_max_intra_bitrate_pct
- 0, // lossless
- 0, // frame_parallel_decoding_mode
- NO_AQ, // aq_mode
- 0, // frame_periodic_delta_q
- BITS_8, // Bit depth
- VP9E_CONTENT_DEFAULT // content
- }
- }
-};
-
struct vpx_codec_alg_priv {vpx_codec_priv_t base;
vpx_codec_enc_cfg_t cfg;
@@ -659,8 +649,6 @@
(void)data;
if (ctx->priv == NULL) {- int i;
- vpx_codec_enc_cfg_t *cfg;
struct vpx_codec_alg_priv *priv = calloc(1, sizeof(*priv));
if (priv == NULL)
@@ -678,16 +666,7 @@
ctx->config.enc = &ctx->priv->alg_priv->cfg;
}
- cfg = &ctx->priv->alg_priv->cfg;
-
- // Select the extra vp6 configuration table based on the current
- // usage value. If the current usage value isn't found, use the
- // values for usage case 0.
- for (i = 0;
- extracfg_map[i].usage && extracfg_map[i].usage != cfg->g_usage;
- ++i) {}-
- priv->extra_cfg = extracfg_map[i].cfg;
+ priv->extra_cfg = default_extra_cfg;
priv->extra_cfg.pkt_list = &priv->pkt_list.head;
vp9_initialize_enc();