Commit bfeb90f9 authored by Yi Luo's avatar Yi Luo Committed by Gerrit Code Review
Browse files

Merge "Delete DCT 64x64 functions to save code size" into nextgenv2

parents 688a2ed1 166dd793
......@@ -23,11 +23,10 @@ const int txfm_type_num = 2;
const TYPE_TXFM txfm_type_ls[2] = { TYPE_DCT, TYPE_ADST };
const int txfm_size_num = 5;
const int txfm_size_ls[5] = { 4, 8, 16, 32, 64 };
const int txfm_size_ls[5] = { 4, 8, 16, 32 };
const TxfmFunc fwd_txfm_func_ls[2][5] = {
{ vp10_fdct4_new, vp10_fdct8_new, vp10_fdct16_new, vp10_fdct32_new,
vp10_fdct64_new },
{ vp10_fdct4_new, vp10_fdct8_new, vp10_fdct16_new, vp10_fdct32_new, NULL },
{ vp10_fadst4_new, vp10_fadst8_new, vp10_fadst16_new, vp10_fadst32_new, NULL }
};
......
......@@ -18,17 +18,15 @@ using libvpx_test::input_base;
namespace {
const int txfm_type_num = 2;
const int txfm_size_num = 5;
const int txfm_size_ls[5] = { 4, 8, 16, 32, 64 };
const int txfm_size_ls[5] = { 4, 8, 16, 32 };
const TxfmFunc fwd_txfm_func_ls[2][5] = {
{ vp10_fdct4_new, vp10_fdct8_new, vp10_fdct16_new, vp10_fdct32_new,
vp10_fdct64_new },
{ vp10_fdct4_new, vp10_fdct8_new, vp10_fdct16_new, vp10_fdct32_new, NULL },
{ vp10_fadst4_new, vp10_fadst8_new, vp10_fadst16_new, vp10_fadst32_new, NULL }
};
const TxfmFunc inv_txfm_func_ls[2][5] = {
{ vp10_idct4_new, vp10_idct8_new, vp10_idct16_new, vp10_idct32_new,
vp10_idct64_new },
{ vp10_idct4_new, vp10_idct8_new, vp10_idct16_new, vp10_idct32_new, NULL },
{ vp10_iadst4_new, vp10_iadst8_new, vp10_iadst16_new, vp10_iadst32_new, NULL }
};
......
This diff is collapsed.
......@@ -22,7 +22,6 @@ static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
case TXFM_TYPE_DCT8: return vp10_fdct8_new;
case TXFM_TYPE_DCT16: return vp10_fdct16_new;
case TXFM_TYPE_DCT32: return vp10_fdct32_new;
case TXFM_TYPE_DCT64: return vp10_fdct64_new;
case TXFM_TYPE_ADST4: return vp10_fadst4_new;
case TXFM_TYPE_ADST8: return vp10_fadst8_new;
case TXFM_TYPE_ADST16: return vp10_fadst16_new;
......
This diff is collapsed.
......@@ -20,7 +20,6 @@ static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
case TXFM_TYPE_DCT8: return vp10_idct8_new;
case TXFM_TYPE_DCT16: return vp10_idct16_new;
case TXFM_TYPE_DCT32: return vp10_idct32_new;
case TXFM_TYPE_DCT64: return vp10_idct64_new;
case TXFM_TYPE_ADST4: return vp10_iadst4_new;
case TXFM_TYPE_ADST8: return vp10_iadst8_new;
case TXFM_TYPE_ADST16: return vp10_iadst16_new;
......
This diff is collapsed.
......@@ -32,7 +32,6 @@ static INLINE TxfmFuncSSE2 fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
case TXFM_TYPE_DCT8: return vp10_fdct8_new_sse4_1; break;
case TXFM_TYPE_DCT16: return vp10_fdct16_new_sse4_1; break;
case TXFM_TYPE_DCT32: return vp10_fdct32_new_sse4_1; break;
case TXFM_TYPE_DCT64: return vp10_fdct64_new_sse4_1; break;
case TXFM_TYPE_ADST4: return vp10_fadst4_new_sse4_1; break;
case TXFM_TYPE_ADST8: return vp10_fadst8_new_sse4_1; break;
case TXFM_TYPE_ADST16: return vp10_fadst16_new_sse4_1; break;
......
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