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

Merge "Initalize zeromv_sse and newmv_sse in vp9_pick_inter_mode"

Browse Source
This commit is contained in:
Jingning Han 2015-01-08 10:55:03 -08:00 committed by Gerrit Code Review
commit 97dc782635
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_denoiser.c
View File

@ -395,7 +395,10 @@ void vp9_denoiser_update_frame_info(VP9_DENOISER *denoiser,
void vp9_denoiser_reset_frame_stats(PICK_MODE_CONTEXT *ctx) { void vp9_denoiser_reset_frame_stats(PICK_MODE_CONTEXT *ctx) {
ctx->zeromv_sse = UINT_MAX; ctx->zeromv_sse = UINT_MAX;
ctx->newmv_sse = UINT_MAX; // This should be initialized as zero since mode search stage might skip
// NEWMV mode if inferred motion vector modes provide sufficiently good
// prediction quality.
ctx->newmv_sse = 0;
} }
void vp9_denoiser_update_frame_stats(MB_MODE_INFO *mbmi, unsigned int sse, void vp9_denoiser_update_frame_stats(MB_MODE_INFO *mbmi, unsigned int sse,

4
vp9/encoder/vp9_pickmode.c
View File

@ -605,6 +605,10 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
mbmi->interp_filter = cm->interp_filter == SWITCHABLE ? mbmi->interp_filter = cm->interp_filter == SWITCHABLE ?
EIGHTTAP : cm->interp_filter; EIGHTTAP : cm->interp_filter;
#if CONFIG_VP9_TEMPORAL_DENOISING
vp9_denoiser_reset_frame_stats(ctx);
#endif
for (ref_frame = LAST_FRAME; ref_frame <= GOLDEN_FRAME; ++ref_frame) { for (ref_frame = LAST_FRAME; ref_frame <= GOLDEN_FRAME; ++ref_frame) {
x->pred_mv_sad[ref_frame] = INT_MAX; x->pred_mv_sad[ref_frame] = INT_MAX;
frame_mv[NEWMV][ref_frame].as_int = INVALID_MV; frame_mv[NEWMV][ref_frame].as_int = INVALID_MV;