Commit 649be94c authored by Paul Wilkins's avatar Paul Wilkins
Browse files

Removal of Hybrid DWT/DCT experiment.

Removal of experiment to simplify code base for other
changes.

Change-Id: If0a33952504558511926ad212bc311fc2bffb19a
parent 097f2052
...@@ -244,7 +244,6 @@ EXPERIMENT_LIST=" ...@@ -244,7 +244,6 @@ EXPERIMENT_LIST="
newbintramodes newbintramodes
comp_interintra_pred comp_interintra_pred
tx64x64 tx64x64
dwtdcthybrid
cnvcontext cnvcontext
newcoefcontext newcoefcontext
enable_6tap enable_6tap
......
...@@ -36,7 +36,6 @@ static int round(double x) { ...@@ -36,7 +36,6 @@ static int round(double x) {
} }
#endif #endif
#if !CONFIG_DWTDCTHYBRID
static const double kPi = 3.141592653589793238462643383279502884; static const double kPi = 3.141592653589793238462643383279502884;
static void reference2_32x32_idct_2d(double *input, double *output) { static void reference2_32x32_idct_2d(double *input, double *output) {
double x; double x;
...@@ -127,9 +126,7 @@ TEST(VP9Idct32x32Test, AccuracyCheck) { ...@@ -127,9 +126,7 @@ TEST(VP9Idct32x32Test, AccuracyCheck) {
} }
} }
} }
#else // CONFIG_DWTDCTHYBRID
// TODO(rbultje/debargha): add DWT-specific tests
#endif // CONFIG_DWTDCTHYBRID
TEST(VP9Fdct32x32Test, AccuracyCheck) { TEST(VP9Fdct32x32Test, AccuracyCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed()); ACMRandom rnd(ACMRandom::DeterministicSeed());
unsigned int max_error = 0; unsigned int max_error = 0;
......
...@@ -47,18 +47,6 @@ void vpx_log(const char *format, ...); ...@@ -47,18 +47,6 @@ void vpx_log(const char *format, ...);
#define MAX_MV_REFS 9 #define MAX_MV_REFS 9
#define MAX_MV_REF_CANDIDATES 4 #define MAX_MV_REF_CANDIDATES 4
#if CONFIG_DWTDCTHYBRID
#define DWT_MAX_LENGTH 64
#define DWT_TYPE 26 // 26/53/97
#define DWT_PRECISION_BITS 2
#define DWT_PRECISION_RND ((1 << DWT_PRECISION_BITS) / 2)
#define DWTDCT16X16 0
#define DWTDCT16X16_LEAN 1
#define DWTDCT8X8 2
#define DWTDCT_TYPE DWTDCT16X16_LEAN
#endif
typedef struct { typedef struct {
int r, c; int r, c;
} POS; } POS;
......
This diff is collapsed.
This diff is collapsed.
...@@ -357,21 +357,17 @@ void vp9_dequant_idct_add_32x32_c(int16_t *input, const int16_t *dq, ...@@ -357,21 +357,17 @@ void vp9_dequant_idct_add_32x32_c(int16_t *input, const int16_t *dq,
if (eob) { if (eob) {
input[0] = input[0] * dq[0] / 2; input[0] = input[0] * dq[0] / 2;
#if !CONFIG_DWTDCTHYBRID
if (eob == 1) { if (eob == 1) {
vp9_short_idct1_32x32_c(input, output); vp9_short_idct1_32x32_c(input, output);
add_constant_residual(output[0], pred, pitch, dest, stride, 32, 32); add_constant_residual(output[0], pred, pitch, dest, stride, 32, 32);
input[0] = 0; input[0] = 0;
} else { } else {
#endif
for (i = 1; i < 1024; i++) for (i = 1; i < 1024; i++)
input[i] = input[i] * dq[1] / 2; input[i] = input[i] * dq[1] / 2;
vp9_short_idct32x32_c(input, output, 64); vp9_short_idct32x32_c(input, output, 64);
vpx_memset(input, 0, 2048); vpx_memset(input, 0, 2048);
add_residual(output, pred, pitch, dest, stride, 32, 32); add_residual(output, pred, pitch, dest, stride, 32, 32);
#if !CONFIG_DWTDCTHYBRID
} }
#endif
} }
} }
......
This diff is collapsed.
...@@ -859,21 +859,18 @@ static void super_block_yrd_32x32(MACROBLOCK *x, ...@@ -859,21 +859,18 @@ static void super_block_yrd_32x32(MACROBLOCK *x,
SUPERBLOCK * const x_sb = &x->sb_coeff_data; SUPERBLOCK * const x_sb = &x->sb_coeff_data;
MACROBLOCKD * const xd = &x->e_mbd; MACROBLOCKD * const xd = &x->e_mbd;
SUPERBLOCKD * const xd_sb = &xd->sb_coeff_data; SUPERBLOCKD * const xd_sb = &xd->sb_coeff_data;
#if DEBUG_ERROR || CONFIG_DWTDCTHYBRID #if DEBUG_ERROR
int16_t out[1024]; int16_t out[1024];
#endif #endif
vp9_transform_sby_32x32(x); vp9_transform_sby_32x32(x);
vp9_quantize_sby_32x32(x); vp9_quantize_sby_32x32(x);
#if DEBUG_ERROR || CONFIG_DWTDCTHYBRID #if DEBUG_ERROR
vp9_short_idct32x32(xd_sb->dqcoeff, out, 64); vp9_short_idct32x32(xd_sb->dqcoeff, out, 64);
#endif #endif
#if !CONFIG_DWTDCTHYBRID
*distortion = vp9_sb_block_error_c(x_sb->coeff, xd_sb->dqcoeff, 1024); *distortion = vp9_sb_block_error_c(x_sb->coeff, xd_sb->dqcoeff, 1024);
#else
*distortion = vp9_block_error_c(x_sb->src_diff, out, 1024) << 4;
#endif
#if DEBUG_ERROR #if DEBUG_ERROR
printf("IDCT/FDCT error 32x32: %d (d: %d)\n", printf("IDCT/FDCT error 32x32: %d (d: %d)\n",
vp9_block_error_c(x_sb->src_diff, out, 1024), *distortion); vp9_block_error_c(x_sb->src_diff, out, 1024), *distortion);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment