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

Merge "Store block-wise statistics obtained in the first pass"

Browse Source
This commit is contained in:
Pengchong Jin 2014-07-28 14:49:05 -07:00 committed by Gerrit Code Review
commit c580428928
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
vp9/encoder/vp9_firstpass.c
View File

@ -599,7 +599,8 @@ void vp9_first_pass(VP9_COMP *cpi) {
#if CONFIG_FP_MB_STATS #if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) { if (cpi->use_fp_mb_stats) {
// TODO(pengchong): store some related block statistics here // initialization
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] = 0;
} }
#endif #endif
@ -700,6 +701,33 @@ void vp9_first_pass(VP9_COMP *cpi) {
// Start by assuming that intra mode is best. // Start by assuming that intra mode is best.
best_ref_mv.as_int = 0; best_ref_mv.as_int = 0;
#if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) {
// intra predication statistics
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] = 0;
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_DCINTRA_MASK;
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] &=
(~FPMB_NONZERO_MOTION_MASK);
if (this_error > FPMB_ERROR_LEVEL4_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL4_MASK;
} else if (this_error > FPMB_ERROR_LEVEL3_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL3_MASK;
} else if (this_error > FPMB_ERROR_LEVEL2_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL2_MASK;
} else if (this_error > FPMB_ERROR_LEVEL1_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL1_MASK;
} else {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL0_MASK;
}
}
#endif
if (motion_error <= this_error) { if (motion_error <= this_error) {
// Keep a count of cases where the inter and intra were very close // Keep a count of cases where the inter and intra were very close
// and very low. This helps with scene cut detection for example in // and very low. This helps with scene cut detection for example in
@ -730,13 +758,41 @@ void vp9_first_pass(VP9_COMP *cpi) {
#if CONFIG_FP_MB_STATS #if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) { if (cpi->use_fp_mb_stats) {
// TODO(pengchong): save some related block statistics here // inter predication statistics
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] = 0;
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] &=
(~FPMB_DCINTRA_MASK);
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] &=
(~FPMB_NONZERO_MOTION_MASK);
if (this_error > FPMB_ERROR_LEVEL4_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL4_MASK;
} else if (this_error > FPMB_ERROR_LEVEL3_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL3_MASK;
} else if (this_error > FPMB_ERROR_LEVEL2_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL2_MASK;
} else if (this_error > FPMB_ERROR_LEVEL1_TH) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL1_MASK;
} else {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_ERROR_LEVEL0_MASK;
}
} }
#endif #endif
if (mv.as_int) { if (mv.as_int) {
++mvcount; ++mvcount;
#if CONFIG_FP_MB_STATS
if (cpi->use_fp_mb_stats) {
cpi->twopass.frame_mb_stats_buf[mb_row * cm->mb_cols + mb_col] |=
FPMB_NONZERO_MOTION_MASK;
}
#endif
// Non-zero vector, was it different from the last non zero vector? // Non-zero vector, was it different from the last non zero vector?
if (mv.as_int != lastmv_as_int) if (mv.as_int != lastmv_as_int)
++new_mv_count; ++new_mv_count;

14
vp9/encoder/vp9_firstpass.h
View File

@ -19,6 +19,20 @@ extern "C" {
#endif #endif
#if CONFIG_FP_MB_STATS #if CONFIG_FP_MB_STATS
#define FPMB_DCINTRA_MASK 0x01
#define FPMB_NONZERO_MOTION_MASK 0x02
#define FPMB_ERROR_LEVEL0_MASK 0x04
#define FPMB_ERROR_LEVEL1_MASK 0x10
#define FPMB_ERROR_LEVEL2_MASK 0x20
#define FPMB_ERROR_LEVEL3_MASK 0x40
#define FPMB_ERROR_LEVEL4_MASK 0x80
#define FPMB_ERROR_LEVEL1_TH 2000
#define FPMB_ERROR_LEVEL2_TH 8000
#define FPMB_ERROR_LEVEL3_TH 24000
#define FPMB_ERROR_LEVEL4_TH 48000
typedef struct { typedef struct {
uint8_t *mb_stats_start; uint8_t *mb_stats_start;
uint8_t *mb_stats_end; uint8_t *mb_stats_end;