Skip to content

Commit

Permalink
Update to FDK-AAC 2.0.3 regarding issue #16
Browse files Browse the repository at this point in the history
  • Loading branch information
tomneda committed Oct 6, 2024
1 parent 902bcd9 commit d59542b
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 15 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ try_find_vcpkg_toolset_path()
print(CMAKE_TOOLCHAIN_FILE)

##############################
project(DABstar VERSION 2.6.0)
project(DABstar VERSION 2.7.0)
##############################

set(objectName "dabstar")
Expand Down Expand Up @@ -132,7 +132,7 @@ option(USE_HBF "Use oversampling with half band filter (needs liquid-dsp)" OFF)
option(DATA_STREAMER OFF)
option(VITERBI_SSE OFF)
option(VITERBI_NEON OFF)
option(FDK_AAC OFF)
option(FDK_AAC ON)

set(USE_FFT FFTW3 CACHE STRING "Choose FFT out of these free: FFTW3 KISS NAYUKI")
set_property(CACHE USE_FFT PROPERTY STRINGS "FFTW3;KISS;NAYUKI")
Expand Down Expand Up @@ -444,6 +444,7 @@ if (FDK_AAC)
list(APPEND extraLibs ${FDK_AAC_LIBRARIES})
add_definitions(-D__WITH_FDK_AAC__)
elseif (NOT FDK_AAC)
message(FATAL_ERROR "libfaad made issues, use better FDK_ACC (>= 2.0.3), or comment out this message")
find_package(Faad)
if (NOT FAAD_FOUND)
message(FATAL_ERROR "Please install libfaad")
Expand Down
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,21 +188,22 @@ sudo apt-get install libfftw3-dev
sudo apt-get install portaudio19-dev
sudo apt-get install zlib1g-dev
sudo apt-get install libsamplerate0-dev
sudo apt-get install libfaad-dev
sudo apt-get install libusb-1.0-0-dev
sudo apt-get install libqwt-qt5-dev
```

or same in fewer lines:

```
sudo apt-get update
sudo apt-get install git cmake build-essential g++ libsndfile1-dev libfftw3-dev portaudio19-dev zlib1g-dev libsamplerate0-dev libfaad-dev libusb-1.0-0-dev
```

If you decide using FDK-ACC (use `-DFDK_AAC=ON` on `cmake` command) instead of faad you can omit installing `libfaad-dev` and install instead this:
As libfaad had made issues with low rate services I switched over to FDK-AAC.
But also the repository version in Ubuntu 24.04 has still flaws with PS (Parametric Stereo) services.
So I recommend to build it for your own. I used the latest main version which is v2.0.3.
```
sudo apt-get install libfdk-aac-dev
git clone /~https://github.com/mstorsjo/fdk-aac.git
git checkout v2.0.3
cd fdk-aac
mkdir build
cd build
cmake ..
make
sudo make install
```

For Qt5 try one of following (Ubuntu 22.04 needs the second one):
Expand All @@ -224,7 +225,7 @@ git clone /~https://github.com/tomneda/DABstar.git
cd DABstar
mkdir build
cd build
cmake .. -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=OFF
cmake .. -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=ON
make
```
Reduce resp. adapt the `cmake` command line for the devices/features you need.
Expand Down Expand Up @@ -289,7 +290,7 @@ https://qwt.sourceforge.io/qwtinstall.html

## Licences

Rights of Qt-DAB, Qt, Qwt, FFTW, portaudio, libfaad, libsamplerate and libsndfile gratefully acknowledged.
Rights of Qt-DAB, Qt, Qwt, FFTW, portaudio, FDK-AAC, libfaad, libsamplerate and libsndfile gratefully acknowledged.

Rights of developers of RTLSDR library, SDRplay libraries, AIRspy library and others gratefully acknowledged.

Expand Down
2 changes: 1 addition & 1 deletion appimage_creator/cmake_and_build_for_appimage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ rm -rf $DST
mkdir -p $DST
cd $DST || exit

cmake $SRC $CMFLAG -DUSE_LTO=ON -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=OFF
cmake $SRC $CMFLAG -DUSE_LTO=ON -DAIRSPY=ON -DSDRPLAY_V2=ON -DSDRPLAY_V3=ON -DHACKRF=ON -DLIMESDR=ON -DRTL_TCP=ON -DPLUTO=ON -DUHD=ON -DRTLSDR_LINUX=ON -DUSE_HBF=OFF -DDATA_STREAMER=OFF -DVITERBI_SSE=ON -DVITERBI_NEON=OFF -DFDK_AAC=ON

if [ $? -eq 0 ]; then
echo "cmake runs successfully, now we begin to build the application"
Expand Down

0 comments on commit d59542b

Please sign in to comment.