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

Merge "Merge mr_pick_inter_mode and pick_inter_mode"

Browse Source
This commit is contained in:
Yunqing Wang 2011-12-19 08:42:20 -08:00 committed by Gerrit Code Review
commit fd294c553a
4 changed files with 329 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
vp8/encoder/encodeframe.c
View File

@ -1186,23 +1186,8 @@ int vp8cx_encode_inter_macroblock
}
else
{
#if CONFIG_MULTI_RES_ENCODING
if (cpi->oxcf.mr_encoder_id == 0)
{
/* Lowest-resolution encoding */
vp8_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
&distortion, &intra_error);
}else
{
/* Higher-resolution encoding */
vp8_mr_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
&distortion, &intra_error, mb_row, mb_col);
}
#else
vp8_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate,
&distortion, &intra_error);
#endif
&distortion, &intra_error, mb_row, mb_col);
}
cpi->prediction_error += distortion;

1037
vp8/encoder/pickinter.c
View File

File diff suppressed because it is too large Load Diff

10
vp8/encoder/pickinter.h
View File

@ -16,14 +16,8 @@
extern void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
int recon_uvoffset, int *returnrate,
int *returndistortion, int *returnintra);
int *returndistortion, int *returnintra,
int mb_row, int mb_col);
extern void vp8_pick_intra_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate);
#if CONFIG_MULTI_RES_ENCODING
extern void vp8_mr_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x,
int recon_yoffset, int recon_uvoffset,
int *returnrate, int *returndistortion,
int *returnintra, int mb_row, int mb_col);
#endif
#endif

4
vp8/vp8_cx_iface.c
View File

@ -361,6 +361,10 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
}
#if CONFIG_MULTI_RES_ENCODING
/* When mr_cfg is NULL, oxcf->mr_total_resolutions and oxcf->mr_encoder_id
* are both memset to 0, which ensures the correct logic under this
* situation.
*/
if(mr_cfg)
{
oxcf->mr_total_resolutions = mr_cfg->mr_total_resolutions;