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

Merge "vp8: Add increase_denoising parameter to denoiser."

Browse Source
This commit is contained in:
Johann
2014-05-16 18:32:39 -07:00
committed by Gerrit Code Review
parent 3dff337eaa 6da66e1114
commit ed83c2a94c
7 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vp8/common/rtcd_defs.pl
View File

@@ -552,7 +552,7 @@ $vp8_yv12_copy_partial_frame_neon_asm=vp8_yv12_copy_partial_frame_neon;
# Denoiser filter # Denoiser filter
# #
if (vpx_config("CONFIG_TEMPORAL_DENOISING") eq "yes") { if (vpx_config("CONFIG_TEMPORAL_DENOISING") eq "yes") {
add_proto qw/int vp8_denoiser_filter/, "unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude"; add_proto qw/int vp8_denoiser_filter/, "unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising";
specialize qw/vp8_denoiser_filter sse2 neon/; specialize qw/vp8_denoiser_filter sse2 neon/;
} }

3
vp8/encoder/arm/neon/denoising_neon.c
View File

@@ -50,7 +50,8 @@ int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y,
unsigned char *running_avg_y, unsigned char *running_avg_y,
int running_avg_y_stride, int running_avg_y_stride,
unsigned char *sig, int sig_stride, unsigned char *sig, int sig_stride,
unsigned int motion_magnitude) { unsigned int motion_magnitude,
int increase_denoising) {
/* If motion_magnitude is small, making the denoiser more aggressive by /* If motion_magnitude is small, making the denoiser more aggressive by
* increasing the adjustment for each level, level1 adjustment is * increasing the adjustment for each level, level1 adjustment is
* increased, the deltas stay the same. * increased, the deltas stay the same.

1
vp8/encoder/block.h
View File

@@ -125,6 +125,7 @@ typedef struct macroblock
int optimize; int optimize;
int q_index; int q_index;
int increase_denoising;
#if CONFIG_TEMPORAL_DENOISING #if CONFIG_TEMPORAL_DENOISING
MB_PREDICTION_MODE best_sse_inter_mode; MB_PREDICTION_MODE best_sse_inter_mode;

41
vp8/encoder/denoising.c
View File

@@ -21,6 +21,7 @@ static const unsigned int NOISE_MOTION_THRESHOLD = 25 * 25;
*/ */
static const unsigned int SSE_DIFF_THRESHOLD = 16 * 16 * 20; static const unsigned int SSE_DIFF_THRESHOLD = 16 * 16 * 20;
static const unsigned int SSE_THRESHOLD = 16 * 16 * 40; static const unsigned int SSE_THRESHOLD = 16 * 16 * 40;
static const unsigned int SSE_THRESHOLD_HIGH = 16 * 16 * 60;
/* /*
* The filter function was modified to reduce the computational complexity. * The filter function was modified to reduce the computational complexity.
@@ -54,20 +55,29 @@ static const unsigned int SSE_THRESHOLD = 16 * 16 * 40;
int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride,
unsigned char *running_avg_y, int avg_y_stride, unsigned char *running_avg_y, int avg_y_stride,
unsigned char *sig, int sig_stride, unsigned char *sig, int sig_stride,
unsigned int motion_magnitude) unsigned int motion_magnitude,
int increase_denoising)
{ {
unsigned char *running_avg_y_start = running_avg_y; unsigned char *running_avg_y_start = running_avg_y;
unsigned char *sig_start = sig; unsigned char *sig_start = sig;
int r, c, i; int sum_diff_thresh;
int r, c;
int sum_diff = 0; int sum_diff = 0;
int adj_val[3] = {3, 4, 6}; int adj_val[3] = {3, 4, 6};
int shift_inc1 = 0;
int shift_inc2 = 1;
/* If motion_magnitude is small, making the denoiser more aggressive by /* If motion_magnitude is small, making the denoiser more aggressive by
* increasing the adjustment for each level. */ * increasing the adjustment for each level. Add another increment for
* blocks that are labeled for increase denoising. */
if (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) if (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD)
{ {
for (i = 0; i < 3; i++) if (increase_denoising) {
adj_val[i] += 1; shift_inc1 = 1;
shift_inc2 = 2;
}
adj_val[0] += shift_inc2;
adj_val[1] += shift_inc2;
adj_val[2] += shift_inc2;
} }
for (r = 0; r < 16; ++r) for (r = 0; r < 16; ++r)
@@ -81,8 +91,9 @@ int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride,
diff = mc_running_avg_y[c] - sig[c]; diff = mc_running_avg_y[c] - sig[c];
absdiff = abs(diff); absdiff = abs(diff);
/* When |diff| < 4, use pixel value from last denoised raw. */ // When |diff| <= |3 + shift_inc1|, use pixel value from
if (absdiff <= 3) // last denoised raw.
if (absdiff <= 3 + shift_inc1)
{ {
running_avg_y[c] = mc_running_avg_y[c]; running_avg_y[c] = mc_running_avg_y[c];
sum_diff += diff; sum_diff += diff;
@@ -123,7 +134,9 @@ int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride,
running_avg_y += avg_y_stride; running_avg_y += avg_y_stride;
} }
if (abs(sum_diff) > SUM_DIFF_THRESHOLD) sum_diff_thresh= SUM_DIFF_THRESHOLD;
if (increase_denoising) sum_diff_thresh = SUM_DIFF_THRESHOLD_HIGH;
if (abs(sum_diff) > sum_diff_thresh)
return COPY_BLOCK; return COPY_BLOCK;
vp8_copy_mem16x16(running_avg_y_start, avg_y_stride, sig_start, sig_stride); vp8_copy_mem16x16(running_avg_y_start, avg_y_stride, sig_start, sig_stride);
@@ -187,7 +200,7 @@ void vp8_denoiser_denoise_mb(VP8_DENOISER *denoiser,
int mv_row; int mv_row;
int mv_col; int mv_col;
unsigned int motion_magnitude2; unsigned int motion_magnitude2;
unsigned int sse_thresh;
MV_REFERENCE_FRAME frame = x->best_reference_frame; MV_REFERENCE_FRAME frame = x->best_reference_frame;
MV_REFERENCE_FRAME zero_frame = x->best_zeromv_reference_frame; MV_REFERENCE_FRAME zero_frame = x->best_zeromv_reference_frame;
@@ -272,7 +285,10 @@ void vp8_denoiser_denoise_mb(VP8_DENOISER *denoiser,
mv_row = x->best_sse_mv.as_mv.row; mv_row = x->best_sse_mv.as_mv.row;
mv_col = x->best_sse_mv.as_mv.col; mv_col = x->best_sse_mv.as_mv.col;
motion_magnitude2 = mv_row * mv_row + mv_col * mv_col; motion_magnitude2 = mv_row * mv_row + mv_col * mv_col;
if (best_sse > SSE_THRESHOLD || motion_magnitude2 sse_thresh = SSE_THRESHOLD;
if (x->increase_denoising) sse_thresh = SSE_THRESHOLD_HIGH;
if (best_sse > sse_thresh || motion_magnitude2
> 8 * NOISE_MOTION_THRESHOLD) > 8 * NOISE_MOTION_THRESHOLD)
{ {
decision = COPY_BLOCK; decision = COPY_BLOCK;
@@ -290,7 +306,8 @@ void vp8_denoiser_denoise_mb(VP8_DENOISER *denoiser,
/* Filter. */ /* Filter. */
decision = vp8_denoiser_filter(mc_running_avg_y, mc_avg_y_stride, decision = vp8_denoiser_filter(mc_running_avg_y, mc_avg_y_stride,
running_avg_y, avg_y_stride, running_avg_y, avg_y_stride,
x->thismb, 16, motion_magnitude2); x->thismb, 16, motion_magnitude2,
x->increase_denoising);
} }
if (decision == COPY_BLOCK) if (decision == COPY_BLOCK)
{ {

1
vp8/encoder/denoising.h
View File

@@ -18,6 +18,7 @@ extern "C" {
#endif #endif
#define SUM_DIFF_THRESHOLD (16 * 16 * 2) #define SUM_DIFF_THRESHOLD (16 * 16 * 2)
#define SUM_DIFF_THRESHOLD_HIGH (16 * 16 * 3)
#define MOTION_MAGNITUDE_THRESHOLD (8*3) #define MOTION_MAGNITUDE_THRESHOLD (8*3)
enum vp8_denoiser_decision enum vp8_denoiser_decision

1
vp8/encoder/pickinter.c
View File

@@ -1177,6 +1177,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
x->best_reference_frame = best_mbmode.ref_frame; x->best_reference_frame = best_mbmode.ref_frame;
best_sse = best_rd_sse; best_sse = best_rd_sse;
} }
x->increase_denoising = 0;
vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse, vp8_denoiser_denoise_mb(&cpi->denoiser, x, best_sse, zero_mv_sse,
recon_yoffset, recon_uvoffset); recon_yoffset, recon_uvoffset);

15
vp8/encoder/x86/denoising_sse2.c
View File

@@ -26,19 +26,24 @@ int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y,
int mc_avg_y_stride, int mc_avg_y_stride,
unsigned char *running_avg_y, int avg_y_stride, unsigned char *running_avg_y, int avg_y_stride,
unsigned char *sig, int sig_stride, unsigned char *sig, int sig_stride,
unsigned int motion_magnitude) unsigned int motion_magnitude,
int increase_denoising)
{ {
unsigned char *running_avg_y_start = running_avg_y; unsigned char *running_avg_y_start = running_avg_y;
unsigned char *sig_start = sig; unsigned char *sig_start = sig;
int sum_diff_thresh;
int r; int r;
int shift_inc = (increase_denoising &&
motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 1 : 0;
__m128i acc_diff = _mm_setzero_si128(); __m128i acc_diff = _mm_setzero_si128();
const __m128i k_0 = _mm_setzero_si128(); const __m128i k_0 = _mm_setzero_si128();
const __m128i k_4 = _mm_set1_epi8(4); const __m128i k_4 = _mm_set1_epi8(4 + shift_inc);
const __m128i k_8 = _mm_set1_epi8(8); const __m128i k_8 = _mm_set1_epi8(8);
const __m128i k_16 = _mm_set1_epi8(16); const __m128i k_16 = _mm_set1_epi8(16);
/* Modify each level's adjustment according to motion_magnitude. */ /* Modify each level's adjustment according to motion_magnitude. */
const __m128i l3 = _mm_set1_epi8( const __m128i l3 = _mm_set1_epi8(
(motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ? 7 : 6); (motion_magnitude <= MOTION_MAGNITUDE_THRESHOLD) ?
7 + shift_inc : 6);
/* Difference between level 3 and level 2 is 2. */ /* Difference between level 3 and level 2 is 2. */
const __m128i l32 = _mm_set1_epi8(2); const __m128i l32 = _mm_set1_epi8(2);
/* Difference between level 2 and level 1 is 1. */ /* Difference between level 2 and level 1 is 1. */
@@ -105,7 +110,9 @@ int vp8_denoiser_filter_sse2(unsigned char *mc_running_avg_y,
+ s.e[6] + s.e[7] + s.e[8] + s.e[9] + s.e[10] + s.e[11] + s.e[6] + s.e[7] + s.e[8] + s.e[9] + s.e[10] + s.e[11]
+ s.e[12] + s.e[13] + s.e[14] + s.e[15]; + s.e[12] + s.e[13] + s.e[14] + s.e[15];
if (abs(sum_diff) > SUM_DIFF_THRESHOLD) sum_diff_thresh = SUM_DIFF_THRESHOLD;
if (increase_denoising) sum_diff_thresh = SUM_DIFF_THRESHOLD_HIGH;
if (abs(sum_diff) > sum_diff_thresh)
{ {
return COPY_BLOCK; return COPY_BLOCK;
} }