Skip to content

Commit 23a4e5f

Browse files
committed
[refactoring] move some libraries in to library directory
1 parent 73dbd16 commit 23a4e5f

26 files changed

+31
-702
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
22

33
project(atracdenc)
4-
4+
include_directories(src)
55
if (UNIX)
66
find_package(GTest)
77
if (GTest_FOUND)

src/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,15 @@ if (${BIGENDIAN})
5656
endif()
5757

5858
include_directories(
59+
"."
5960
"lib"
60-
"oma/liboma/include"
61+
"lib/liboma/include"
6162
)
6263

6364
set(SOURCE_FFT_LIB fft/kissfft_impl/kiss_fft.c)
6465
set_source_files_properties(fft/kissfft_impl/kiss_fft.c PROPERTIES COMPILE_FLAGS -Dkiss_fft_scalar=double)
65-
set(SOURCE_OMA_LIB oma/liboma/src/liboma.c)
66-
set(SOURCE_BITSTREAM_LIB bitstream/bitstream.cpp)
66+
set(SOURCE_OMA_LIB lib/liboma/src/liboma.c)
67+
set(SOURCE_BITSTREAM_LIB lib/bitstream/bitstream.cpp)
6768
set(SOURCE_ATRACDENC_IMPL
6869
wav.cpp
6970
aea.cpp
@@ -81,7 +82,7 @@ set(SOURCE_ATRACDENC_IMPL
8182
atrac3denc.cpp
8283
atrac/atrac3.cpp
8384
atrac/atrac3_bitstream.cpp
84-
mdct/mdct.cpp
85+
lib/mdct/mdct.cpp
8586
)
8687

8788
add_library(fft_impl STATIC ${SOURCE_FFT_LIB})

src/atrac/atrac1.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@
2121
#include <array>
2222
#include <map>
2323
#include <math.h>
24-
#include "../bitstream/bitstream.h"
25-
#include "../config.h"
24+
#include "config.h"
2625
namespace NAtracDEnc {
2726
namespace NAtrac1 {
2827

src/atrac/atrac1_bitalloc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include "atrac1.h"
2323
#include <math.h>
2424
#include <cassert>
25-
#include "../bitstream/bitstream.h"
25+
#include "bitstream/bitstream.h"
2626
#include "../env.h"
2727

2828
namespace NAtracDEnc {

src/atrac/atrac1_bitalloc.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#pragma once
2020
#include "atrac_scale.h"
21-
#include "../bitstream/bitstream.h"
2221
#include "../aea.h"
2322
#include "../atrac/atrac1.h"
2423
#include <vector>

src/atrac/atrac3_bitstream.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
#include "atrac3_bitstream.h"
2020
#include "atrac_psy_common.h"
21-
#include "../bitstream/bitstream.h"
21+
#include "bitstream/bitstream.h"
2222
#include "../util.h"
2323
#include <algorithm>
2424
#include <iostream>

src/atrac/atrac3plus_pqf/atrac3plus_pqf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "atrac3plus_pqf.h"
3131
#include "atrac3plus_pqf_data.h"
3232

33-
#include "../../mdct/dct.h"
33+
#include "lib/mdct/dct.h"
3434

3535
/*
3636
* Number of subbands to split input signal

src/atrac/atrac_scale.h

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <cstdint>
2323

2424
#include "atrac1.h"
25+
#include "lib/bitstream/bitstream.h"
2526
#include "../config.h"
2627

2728
namespace NAtracDEnc {

src/atrac1denc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#include "atrac/atrac1.h"
2424
#include "atrac/atrac1_qmf.h"
2525
#include "atrac/atrac_scale.h"
26-
#include "mdct/mdct.h"
26+
#include "lib/mdct/mdct.h"
2727

2828
#include <assert.h>
2929
#include <vector>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/oma/liboma/src/liboma.c src/lib/liboma/src/liboma.c

+5-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
*/
1818

1919
#include "../include/oma.h"
20-
#include "oma_internal.h"
2120

2221
#include <endian_tools.h>
2322

@@ -30,6 +29,11 @@
3029

3130
#define OMA_HEADER_SIZE 96
3231

32+
struct omafile_ctx {
33+
FILE* file;
34+
oma_info_t info;
35+
};
36+
3337
static const int liboma_samplerates[8] = { 32000, 44100, 48000, 88200, 96000, 0 };
3438
static const char* codec_name[6] = { "ATRAC3", "ATRAC3PLUS", "MPEG1LAYER3", "LPCM", "", "OMAC_ID_WMA" };
3539
static char ea3_str[] = {'E', 'A', '3'};
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/mdct/dct.h src/lib/mdct/dct.h

File renamed without changes.
File renamed without changes.

src/mdct/mdct.h src/lib/mdct/mdct.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#pragma once
2020

21-
#include "../config.h"
22-
#include "../fft/kissfft_impl/kiss_fft.h"
21+
#include "config.h"
22+
#include "fft/kissfft_impl/kiss_fft.h"
2323
#include <vector>
2424
#include <type_traits>
2525

File renamed without changes.

0 commit comments

Comments
 (0)