generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removing extraconfig_map from vp8_cx_iface.c."

Browse Source
This commit is contained in:
Dmitry Kovalev
2014-08-22 17:20:42 -07:00
committed by Gerrit Code Review
parent aaea40d847 48274c64a4
commit 7982b27353
1 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
vp8/vp8_cx_iface.c
View File

@@ -39,17 +39,7 @@ struct vp8_extracfg
}; };
struct extraconfig_map static struct vp8_extracfg default_extracfg = {
{
int usage;
struct vp8_extracfg cfg;
};
static const struct extraconfig_map extracfg_map[] =
{
{
0,
{
NULL, NULL,
#if !(CONFIG_REALTIME_ONLY) #if !(CONFIG_REALTIME_ONLY)
0, /* cpu_used */ 0, /* cpu_used */
@@ -71,8 +61,6 @@ static const struct extraconfig_map extracfg_map[] =
0, /* tuning*/ 0, /* tuning*/
10, /* cq_level */ 10, /* cq_level */
0, /* rc_max_intra_bitrate_pct */ 0, /* rc_max_intra_bitrate_pct */
}
}
}; };
struct vpx_codec_alg_priv struct vpx_codec_alg_priv
@@ -632,9 +620,6 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,
{ {
vpx_codec_err_t res = VPX_CODEC_OK; vpx_codec_err_t res = VPX_CODEC_OK;
struct vpx_codec_alg_priv *priv; struct vpx_codec_alg_priv *priv;
vpx_codec_enc_cfg_t *cfg;
unsigned int i;
struct VP8_COMP *optr; struct VP8_COMP *optr;
vp8_rtcd(); vp8_rtcd();
@@ -662,17 +647,8 @@ static vpx_codec_err_t vp8e_init(vpx_codec_ctx_t *ctx,
ctx->config.enc = &ctx->priv->alg_priv->cfg; ctx->config.enc = &ctx->priv->alg_priv->cfg;
} }
cfg = &ctx->priv->alg_priv->cfg;
/* Select the extra vp8 configuration table based on the current priv->vp8_cfg = default_extracfg;
* 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->vp8_cfg = extracfg_map[i].cfg;
priv->vp8_cfg.pkt_list = &priv->pkt_list.head; priv->vp8_cfg.pkt_list = &priv->pkt_list.head;
priv->cx_data_sz = priv->cfg.g_w * priv->cfg.g_h * 3 / 2 * 2; priv->cx_data_sz = priv->cfg.g_w * priv->cfg.g_h * 3 / 2 * 2;