diff options
| author | Angie Chiang <angiebird@google.com> | 2015-09-28 17:26:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-28 17:26:22 +0000 |
| commit | e40a448e456a05d2c15a2f7549b7985426682629 (patch) | |
| tree | ef4fd748ba89ed8c4e8d957b5e941df918c4fc39 | |
| parent | cc5dd3ec10e6b7765ae69a81a82e4ad4786552fd (diff) | |
| parent | 6a382101dd84027d25c3766110bc396d6b27467f (diff) | |
| download | libvpx-e40a448e456a05d2c15a2f7549b7985426682629.tar libvpx-e40a448e456a05d2c15a2f7549b7985426682629.tar.gz libvpx-e40a448e456a05d2c15a2f7549b7985426682629.tar.bz2 libvpx-e40a448e456a05d2c15a2f7549b7985426682629.zip | |
Merge "comment out fdct32"
| -rw-r--r-- | test/vp10_dct_test.cc | 3 | ||||
| -rw-r--r-- | vp10/encoder/dct.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/vp10_dct_test.cc b/test/vp10_dct_test.cc index 8e49609de..b2c301ae3 100644 --- a/test/vp10_dct_test.cc +++ b/test/vp10_dct_test.cc @@ -107,6 +107,5 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values( FdctParam(&fdct4, &reference_dct_1d, 4, 1), FdctParam(&fdct8, &reference_dct_1d, 8, 1), - FdctParam(&fdct16, &reference_dct_1d, 16, 2), - FdctParam(&fdct32, &reference_dct_1d, 32, 4))); + FdctParam(&fdct16, &reference_dct_1d, 16, 2))); } // namespace diff --git a/vp10/encoder/dct.c b/vp10/encoder/dct.c index 80ace06cd..c61babefd 100644 --- a/vp10/encoder/dct.c +++ b/vp10/encoder/dct.c @@ -322,6 +322,7 @@ static void fdct16(const tran_low_t *input, tran_low_t *output) { range_check(output, 16, 16); } +/* #TODO(angiebird): Unify this with vp10_fwd_txfm.c: vp10_fdct32 static void fdct32(const tran_low_t *input, tran_low_t *output) { tran_high_t temp; tran_low_t step[32]; @@ -719,6 +720,7 @@ static void fdct32(const tran_low_t *input, tran_low_t *output) { range_check(output, 32, 18); } +*/ static void fadst4(const tran_low_t *input, tran_low_t *output) { tran_high_t x0, x1, x2, x3; |