Merge branch 'marcusmueller-external_libtoolame_dab' into working_branch

kit-cel · Jul 26, 2017 · 008fa48 · 008fa48
2 parents 80ff4ed + 56d5d2b
commit 008fa48
Show file tree

Hide file tree

Showing 160 changed files with 161 additions and 17,137 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ODR-AudioEnc"]
+	path = ODR-AudioEnc
+	url = https://github.com/Opendigitalradio/ODR-AudioEnc/
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,6 +62,16 @@ else()
     message(STATUS "FDK-AAC found")
 endif ()
 
+########################################################################
+# Find LIBTOOLAME-DAB
+########################################################################
+find_package(Libtoolame-dab REQUIRED)
+if (NOT LIBTOOLAME-DAB_FOUND )
+    message(FATAL_ERROR "please make sure the libtoolame-dab source can be found")
+else()
+    message(STATUS "LIBTOOLAME-DAB found: ${LIBTOOLAME-DAB_SOURCE_DIR}")
+endif ()
+
 
 ########################################################################
 # Find boost

diff --git a/ODR-AudioEnc b/ODR-AudioEnc
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,95 @@
+gr-dab
+======
+
+A Digital Audio Broadcasting and Digital Audio Broadcasting + module for GNU Radio 
+
+Contents
+--------
+
+0: License
+
+1: Installation
+
+2: Usage
+
+3: Features
+
+4: (Current) Constraints
+
+5: Known Bugs
+
+License
+-------
+Copyright (C) Andreas Müller, 2011, Moritz Luca Schmid, 2017
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+Installation
+------------
+
+This directory (and the resulting tarball) contains a build tree for
+gr-dab.
+
+This package requires that GNU Radio is already installed.  It
+also depends on some GNU Radio prerequisites, such as Boost and
+cppunit.
+
+It also depends on fdk-aac. If you're on a Debianoid (Debian, Mint, *buntu…),
+you might want to `apt-get install fdk-aac-dev`.  If you're on a Redhatoid
+(Redhat, Fedora, Centos…), `dnf install fdk-aac-devel` is the analogous method
+of installing this dependency.
+
+There is a dependency on the modified MPEG encoder libtoolame from the ODR
+project. It's fetched by ´git submodule update --init´ automatically.
+
+To build this module, run these commands:
+
+    $ git submodule update --init
+    $ mkdir build
+    $ cd build
+    $ cmake ../
+    $ make
+    $ sudo make install
+    $ sudo ldconfig
+
+
+
+Usage
+-----
+
+Receiving DAB+ broadcasts
+#########################
+
+TODO: insert Flowgraph 
+
+Transmitting DAB+
+#################
+
+TODO: insert Flowgraph 
+
+Features
+--------
+
+* Transmits DAB+ Audio transmissions, metadata
+* Receives DAB+
+
+(Current) Constraints
+---------------------
+
+TODO
+
+Known Bugs
+----------
+
diff --git a/cmake/Modules/FindLibtoolame-dab.cmake b/cmake/Modules/FindLibtoolame-dab.cmake
@@ -0,0 +1,30 @@
+# Try to find the libtoolame-dab source library.
+# Once done this will define
+#
+# LIBTOOLAME-DAB_SOURCE_DIRS - where to find toolame.h, etc.
+
+find_path(LIBTOOLAME-DAB_INCLUDE_DIR libtoolame-dab/toolame.h
+  ${CMAKE_SOURCE_DIR}/ODR-AudioEnc
+  NO_DEFAULT_PATH NO_CMAKE_PATH NO_CMAKE_SYSTEM_PATH
+)
+
+if(LIBTOOLAME-DAB_INCLUDE_DIR)
+  set(LIBTOOLAME-DAB_SOURCE_DIR "${LIBTOOLAME-DAB_INCLUDE_DIR}/libtoolame-dab")
+  set(LIBTOOLAME-DAB_FOUND 1)
+endif(LIBTOOLAME-DAB_INCLUDE_DIR)
+
+
+mark_as_advanced(LIBTOOLAME-DAB_SOURCE_DIR)
+mark_as_advanced(LIBTOOLAME-DAB_INCLUDE_DIR)
+mark_as_advanced(LIBTOOLAME-DAB_FOUND)
+
+if(NOT LIBTOOLAME-DAB_FOUND)
+  set(LIBTOOLAME-DAB_DIR_MESSAGE "libtoolame-dab was not found. Make sure and LIBTOOLAME-DAB_SOURCE_DIR is set.")
+  if(NOT LIBTOOLAME-DAB_FIND_QUIETLY)
+    message(STATUS "${LIBTOOLAME-DAB_DIR_MESSAGE}")
+  else(NOT LIBTOOLAME-DAB_FIND_QUIETLY)
+    if(LIBTOOLAME-DAB_FIND_REQUIRED)
+      message(FATAL_ERROR "${LIBTOOLAME-DAB_DIR_MESSAGE}")
+    endif(LIBTOOLAME-DAB_FIND_REQUIRED)
+  endif(NOT LIBTOOLAME-DAB_FIND_QUIETLY)
+endif(NOT LIBTOOLAME-DAB_FOUND)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -22,7 +22,7 @@
 ########################################################################
 include(GrPlatform) #define LIB_SUFFIX
 
-include_directories(${Boost_INCLUDE_DIR} ${FDK-AAC_INCLUDE_DIRS})
+include_directories(${Boost_INCLUDE_DIR} ${FDK-AAC_INCLUDE_DIRS} ${LIBTOOLAME-DAB_INCLUDE_DIR})
 link_directories(${Boost_LIBRARY_DIRS})
 list(APPEND dab_sources
     moving_sum_ff_impl.cc
@@ -72,27 +72,27 @@ list(APPEND dab_sources
     reed_solomon_encode_bb_impl.cc
     mp4_encode_sb_impl.cc
     mp2_encode_sb_impl.cc
-    libtoolame-dab/ath.c
-    libtoolame-dab/crc.c
-    libtoolame-dab/fft.c
-    libtoolame-dab/mem.c
-    libtoolame-dab/utils.c
-    libtoolame-dab/common.c
-    libtoolame-dab/encode.c
-    libtoolame-dab/tables.c
-    libtoolame-dab/subband.c
-    libtoolame-dab/toolame.c
-    libtoolame-dab/psycho_0.c
-    libtoolame-dab/psycho_1.c
-    libtoolame-dab/psycho_2.c
-    libtoolame-dab/psycho_3.c
-    libtoolame-dab/psycho_4.c
-    libtoolame-dab/availbits.c
-    libtoolame-dab/bitstream.c
-    libtoolame-dab/ieeefloat.c
-    libtoolame-dab/psycho_n1.c
-    libtoolame-dab/encode_new.c
-    libtoolame-dab/portableio.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/ath.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/crc.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/fft.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/mem.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/utils.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/common.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/encode.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/tables.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/subband.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/toolame.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_0.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_1.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_2.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_3.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_4.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/availbits.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/bitstream.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/ieeefloat.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/psycho_n1.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/encode_new.c
+    ${LIBTOOLAME-DAB_SOURCE_DIR}/portableio.c
 )
 
 

diff --git a/lib/libtoolame-dab/.deps/.dirstamp b/lib/libtoolame-dab/.deps/.dirstamp
diff --git a/lib/libtoolame-dab/.deps/libtoolame_dab_la-ath.Plo b/lib/libtoolame-dab/.deps/libtoolame_dab_la-ath.Plo