Commit 36c4e8b2 authored by Angie Chiang's avatar Angie Chiang Committed by Gerrit Code Review

Merge "remove static from fdct4/8/16/32"

parents 90889b9a 8903b9fa
......@@ -168,7 +168,7 @@ TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) := test_intra_pred_speed.cc
TEST_INTRA_PRED_SPEED_SRCS-$(CONFIG_VP9) += ../md5_utils.h ../md5_utils.c
## VP10
LIBVPX_TEST_SRCS-$(CONFIG_VP10_ENCODER) += vp10_dct_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_dct_test.cc
LIBVPX_TEST_SRCS-$(CONFIG_VP10) += vp10_inv_txfm_test.cc
endif # CONFIG_SHARED
......
......@@ -17,10 +17,7 @@
#include "test/util.h"
#include "./vpx_config.h"
#include "vpx_ports/msvc.h"
#undef CONFIG_COEFFICIENT_RANGE_CHECKING
#define CONFIG_COEFFICIENT_RANGE_CHECKING 1
#include "vp10/encoder/dct.c"
#include "vp10/encoder/dct.h"
using libvpx_test::ACMRandom;
......@@ -105,8 +102,8 @@ TEST_P(Vp10FwdTxfm, RunFwdAccuracyCheck) {
INSTANTIATE_TEST_CASE_P(
C, Vp10FwdTxfm,
::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(&vp10_fdct4, &reference_dct_1d, 4, 1),
FdctParam(&vp10_fdct8, &reference_dct_1d, 8, 1),
FdctParam(&vp10_fdct16, &reference_dct_1d, 16, 2),
FdctParam(&vp10_fdct32_local, &reference_dct_1d, 32, 4)));
} // namespace
......@@ -34,7 +34,7 @@ static INLINE void range_check(const tran_low_t *input, const int size,
#endif
}
static void fdct4(const tran_low_t *input, tran_low_t *output) {
void vp10_fdct4(const tran_low_t *input, tran_low_t *output) {
tran_high_t temp;
tran_low_t step[4];
......@@ -70,7 +70,7 @@ static void fdct4(const tran_low_t *input, tran_low_t *output) {
range_check(output, 4, 13);
}
static void fdct8(const tran_low_t *input, tran_low_t *output) {
void vp10_fdct8(const tran_low_t *input, tran_low_t *output) {
tran_high_t temp;
tran_low_t step[8];
......@@ -148,7 +148,7 @@ static void fdct8(const tran_low_t *input, tran_low_t *output) {
range_check(output, 8, 14);
}
static void fdct16(const tran_low_t *input, tran_low_t *output) {
void vp10_fdct16(const tran_low_t *input, tran_low_t *output) {
tran_high_t temp;
tran_low_t step[16];
......@@ -322,7 +322,8 @@ static void fdct16(const tran_low_t *input, tran_low_t *output) {
range_check(output, 16, 16);
}
static void fdct32(const tran_low_t *input, tran_low_t *output) {
// TODO(angiebird): Unify this with vp10_fwd_txfm.c: vp10_fdct32
void vp10_fdct32_local(const tran_low_t *input, tran_low_t *output) {
tran_high_t temp;
tran_low_t step[32];
......@@ -995,24 +996,24 @@ static void fadst16(const tran_low_t *input, tran_low_t *output) {
}
static const transform_2d FHT_4[] = {
{ fdct4, fdct4 }, // DCT_DCT = 0
{ fadst4, fdct4 }, // ADST_DCT = 1
{ fdct4, fadst4 }, // DCT_ADST = 2
{ fadst4, fadst4 } // ADST_ADST = 3
{ vp10_fdct4, vp10_fdct4 }, // DCT_DCT = 0
{ fadst4, vp10_fdct4 }, // ADST_DCT = 1
{ vp10_fdct4, fadst4 }, // DCT_ADST = 2
{ fadst4, fadst4 } // ADST_ADST = 3
};
static const transform_2d FHT_8[] = {
{ fdct8, fdct8 }, // DCT_DCT = 0
{ fadst8, fdct8 }, // ADST_DCT = 1
{ fdct8, fadst8 }, // DCT_ADST = 2
{ fadst8, fadst8 } // ADST_ADST = 3
{ vp10_fdct8, vp10_fdct8 }, // DCT_DCT = 0
{ fadst8, vp10_fdct8 }, // ADST_DCT = 1
{ vp10_fdct8, fadst8 }, // DCT_ADST = 2
{ fadst8, fadst8 } // ADST_ADST = 3
};
static const transform_2d FHT_16[] = {
{ fdct16, fdct16 }, // DCT_DCT = 0
{ fadst16, fdct16 }, // ADST_DCT = 1
{ fdct16, fadst16 }, // DCT_ADST = 2
{ fadst16, fadst16 } // ADST_ADST = 3
{ vp10_fdct16, vp10_fdct16 }, // DCT_DCT = 0
{ fadst16, vp10_fdct16 }, // ADST_DCT = 1
{ vp10_fdct16, fadst16 }, // DCT_ADST = 2
{ fadst16, fadst16 } // ADST_ADST = 3
};
void vp10_fht4x4_c(const int16_t *input, tran_low_t *output,
......@@ -1123,7 +1124,7 @@ void vp10_fdct8x8_quant_c(const int16_t *input, int stride,
// Rows
for (i = 0; i < 8; ++i) {
fdct8(&intermediate[i * 8], &coeff_ptr[i * 8]);
vp10_fdct8(&intermediate[i * 8], &coeff_ptr[i * 8]);
for (j = 0; j < 8; ++j)
coeff_ptr[j + i * 8] /= 2;
}
......
/*
* Copyright (c) 2015 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef VP10_ENCODER_DCT_H_
#define VP10_ENCODER_DCT_H_
#include "vpx_dsp/vpx_dsp_common.h"
#ifdef __cplusplus
extern "C" {
#endif
void vp10_fdct4(const tran_low_t *input, tran_low_t *output);
void vp10_fdct8(const tran_low_t *input, tran_low_t *output);
void vp10_fdct16(const tran_low_t *input, tran_low_t *output);
void vp10_fdct32_local(const tran_low_t *input, tran_low_t *output);
#ifdef __cplusplus
} // extern "C"
#endif
#endif // VP10_ENCODER_DCT_H_
......@@ -23,6 +23,7 @@ VP10_CX_SRCS-yes += encoder/context_tree.c
VP10_CX_SRCS-yes += encoder/context_tree.h
VP10_CX_SRCS-yes += encoder/cost.h
VP10_CX_SRCS-yes += encoder/cost.c
VP10_CX_SRCS-yes += encoder/dct.h
VP10_CX_SRCS-yes += encoder/dct.c
VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.c
VP10_CX_SRCS-$(CONFIG_VP9_TEMPORAL_DENOISING) += encoder/denoiser.h
......
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