aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniil Cherednik <dan.cherednik@gmail.com>2016-04-02 00:50:53 +0300
committerDaniil Cherednik <dan.cherednik@gmail.com>2016-04-05 02:43:19 +0300
commit267fb13c0c31e78d611a697cd1d01d0e7584bc34 (patch)
treed5ffae5a74e0753dbf51d017dfb77c889ca1ad42
parent0f11bd3264dbdeff1ceb537341a7ac80398ac113 (diff)
downloadatracdenc-267fb13c0c31e78d611a697cd1d01d0e7584bc34.tar.gz
atracdenc ut added to CMake build
-rw-r--r--CMakeLists.txt1
-rw-r--r--src/atracdenc_ut.cpp2
-rw-r--r--test/CMakeLists.txt14
3 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b6b58c..db76a04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+set(CMAKE_CXX_STANDARD 11)
add_subdirectory(3rd/gtest-1.7.0)
add_subdirectory(src)
diff --git a/src/atracdenc_ut.cpp b/src/atracdenc_ut.cpp
index 975adc5..5370e9e 100644
--- a/src/atracdenc_ut.cpp
+++ b/src/atracdenc_ut.cpp
@@ -35,7 +35,7 @@ TEST(TAtrac1MDCT, TAtrac1MDCTLongEncDec) {
for (int i = 0; i < 256; i++) {
hi[i] = i;
}
- const TBlockSize blockSize; //default - long
+ const TBlockSize blockSize(false, false, false);
mdct.Mdct(&specs[0], &low[0], &mid[0], &hi[0], blockSize);
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d76cbea..c8ca48b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,3 +13,17 @@ set(bitstream_test_sources
)
add_executable(bitstream_test ${bitstream_test_sources})
target_link_libraries(bitstream_test gtest_main)
+
+set(atrac1mdct_test_sources
+ ../src/atracdenc.cpp
+ ../src/transient_detector.cpp
+ ../src/bitstream/bitstream.cpp
+ ../src/atrac/atrac_scale.cpp
+ ../src/atrac/atrac1_dequantiser.cpp
+ ../src/atrac/atrac1_bitalloc.cpp
+ ../src/atrac/atrac1.cpp
+ ../src/atracdenc_ut.cpp
+ ../src/aea.cpp
+)
+add_executable(atrac1mdct_test ${atrac1mdct_test_sources})
+target_link_libraries(atrac1mdct_test mdct_impl gtest_main)