Merge remote-tracking branch 'ulmus-scott/freesurround'

mythtv/.cppcheck-suppress

@@ -9,7 +9,6 @@
 *:*/filters/*
 *:*/html/*
 *:*/libs/libmythfreemheg/*
-*:*/libs/libmythfreesurround/*
 *:*/libs/libmythmpeg2/*
 *:*/libs/libmythtv/visualisations/goom/*
 *:*/programs/mythbackend/serviceHosts/*

mythtv/CMakeLists.txt

@@ -249,7 +249,6 @@ set_target_properties(
   mythbase
   mythdvdnav
   mythfreemheg
-  mythfreesurround
   mythmetadata
   mythmpeg2
   mythprotoserver

mythtv/docs/doxygen-architecture-document.cpp

@@ -97,8 +97,7 @@ There are also a few simple \ref testing "testing shortcuts".
       and some old UI widgets are implemented by libmyth.
 
       This library depends on libav*, \ref libmythbase "libmythbase",
-      \ref libmythui "libmythui", \ref libmythupnp "libmythupnp"
-      and libmythfreesurround.
+      \ref libmythui "libmythui", and \ref libmythupnp "libmythupnp".
 
       Any changes to this library's ABI may trigger a %MythTV binary version
       change because the plugins depend on it.
@@ -155,16 +154,6 @@ There are also a few simple \ref testing "testing shortcuts".
 
       This library does not depend on any of our libraries.
 
-  <dt>libmythfreesurround
-      <dd>Support for some multi-channel audio transforms.
-
-      This library does not depend on any of our libraries.
-
-  <dt>libmythnvctrl
-      <dd>Interface between X-windows and NVidia drivers.
-
-      This library does not depend on any of our libraries.
-
 </dl>
 The libmythmpeg2 library appears redundant with the system libsamplerate, but
 libmpeg2 decodes MPEG-2 more quickly than ffmpeg on some systems, and

mythtv/libs/CMakeLists.txt

@@ -1,5 +1,4 @@
 add_subdirectory(libmythbase)
-add_subdirectory(libmythfreesurround)
 add_subdirectory(libmythservicecontracts)
 if(TARGET mythtv_mheg)
   add_subdirectory(libmythfreemheg)

mythtv/libs/libmyth/CMakeLists.txt

@@ -37,6 +37,8 @@ set(AUDIO_HEADERS_NOT_INSTALLED
     audio/audiooutputdownmix.h
     audio/audiooutputgraph.h
     audio/audiooutputnull.h
+    audio/freesurround.h
+    audio/freesurround_decoder.h
     audio/pink.h
     audio/spdifencoder.h)
 
@@ -62,6 +64,8 @@ add_library(
   audio/audiooutpututil.cpp
   audio/audiosettings.cpp
   audio/eldutils.cpp
+  audio/freesurround.cpp
+  audio/freesurround_decoder.cpp
   audio/pink.cpp
   audio/spdifencoder.cpp
   audio/volumebase.cpp
@@ -151,7 +155,6 @@ target_link_libraries(
   PUBLIC mythbase
          mythui
          mythupnp
-         mythfreesurround
          mythbluray
          PkgConfig::LIBAVCODEC
          PkgConfig::LIBAVFORMAT

mythtv/libs/libmyth/audio/audiooutputbase.cpp

@@ -22,12 +22,12 @@
 #include "libmythbase/compat.h"
 #include "libmythbase/mythconfig.h"
 #include "libmythbase/mythlogging.h"
-#include "libmythfreesurround/freesurround.h"
 
 #include "audiooutputbase.h"
 #include "audiooutputdigitalencoder.h"
 #include "audiooutputdownmix.h"
 #include "audiooutpututil.h"
+#include "freesurround.h"
 #include "spdifencoder.h"
 
 // AC3 encode currently disabled for Android

mythtv/libs/libmythfreesurround/freesurround.cpp → mythtv/libs/libmyth/audio/freesurround.cpp

@@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+#include "freesurround.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -29,14 +30,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <list>
 #include <map>
 
-#include "libmythbase/compat.h"
 #include "libmythbase/mythlogging.h"
 
-#include "freesurround.h"
-#include "el_processor.h"
-
 #include <QString>
-#include <QDateTime>
+
+#include "freesurround_decoder.h"
 
 // our default internal block size, in floats
 static const unsigned default_block_size = SURROUND_BUFSIZE;
@@ -129,13 +127,6 @@ void FreeSurround::SetParams()
     }
 }
 
-FreeSurround::fsurround_params::fsurround_params(int32_t center_width,
-                                                 int32_t dimension) :
-    center_width(center_width),
-    dimension(dimension)
-{
-}
-
 FreeSurround::~FreeSurround()
 {
     LOG(VB_AUDIO, LOG_DEBUG, QString("FreeSurround::~FreeSurround"));
@@ -154,10 +145,6 @@ uint FreeSurround::putFrames(void* buffer, uint numFrames, uint numChannels)
     auto *samples = (float *)buffer;
     // demultiplex
 
-    float **inputs = m_decoder->getInputBuffers();
-    float *lt      = &inputs[0][ic];
-    float *rt      = &inputs[1][ic];
-
     if ((m_surroundMode != SurroundModePassive) && (ic+numFrames > bs))
     {
         numFrames = bs - ic;
@@ -180,6 +167,9 @@ uint FreeSurround::putFrames(void* buffer, uint numFrames, uint numChannels)
                     process = false;
                     break;
                 default:
+                    float **inputs = m_decoder->getInputBuffers();
+                    float *lt      = &inputs[0][ic];
+                    float *rt      = &inputs[1][ic];
                     for (i=0; i<numFrames; i++)
                         *lt++ = *rt++ = *samples++;
                     process = true;
@@ -219,6 +209,9 @@ uint FreeSurround::putFrames(void* buffer, uint numFrames, uint numChannels)
                     process = false;
                     break;
                 default:
+                    float **inputs = m_decoder->getInputBuffers();
+                    float *lt      = &inputs[0][ic];
+                    float *rt      = &inputs[1][ic];
                     for (i=0; i<numFrames; i++)
                     {
                         *lt++ = *samples++;

mythtv/libs/libmythfreesurround/freesurround.h → mythtv/libs/libmyth/audio/freesurround.h

@@ -19,11 +19,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef FREESURROUND_H
 #define FREESURROUND_H
 
-#include "libmythbase/compat.h"  // instead of sys/types.h, for MinGW compatibility
+#include <cstdint>
+
+using uint = unsigned int;
 
 static constexpr uint16_t SURROUND_BUFSIZE { 8192 };
 
-class Q_DECL_EXPORT FreeSurround
+class FreeSurround
 {
 public:
     enum SurroundMode : std::uint8_t
@@ -61,16 +63,14 @@ class Q_DECL_EXPORT FreeSurround
 
     // the changeable parameters
     struct fsurround_params {
-        int32_t center_width;           // presence of the center channel
-        int32_t dimension;              // dimension
+        int32_t center_width { 100 };   // presence of the center channel
+        int32_t dimension {      0 };   // dimension
         float   coeff_a   { 0.8165 };   // surround mixing coefficients
         float   coeff_b   { 0.5774 };   // surround mixing coefficients
         int32_t phasemode {      0 };   // phase shifting mode
         int32_t steering  {      1 };   // steering mode (0=simple, 1=linear)
         int32_t front_sep {    100 };   // front stereo separation
         int32_t rear_sep  {    100 };   // rear stereo separation
-        // (default) constructor
-        explicit fsurround_params(int32_t center_width=100, int32_t dimension=0);
     } m_params;
 
     // additional settings

mythtv/libs/libmythfreesurround/el_processor.cpp → mythtv/libs/libmyth/audio/freesurround_decoder.cpp

@@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
+#include "freesurround_decoder.h"
 
-#include "el_processor.h"
 #include <algorithm>
 #include <array>
 #include <cmath>
@@ -278,13 +278,6 @@ class fsurround_decoder::Impl {
             } else {
                 // --- this is the old & simple steering mode ---
 
-                // calculate the amplitude/phase difference
-                float ampDiff = clamp_unit_mag((ampL+ampR < epsilon) ? 0 : (ampR-ampL) / (ampR+ampL));
-                float phaseDiff = phaseL - phaseR;
-                if (phaseDiff < -PI) phaseDiff += 2*PI;
-                if (phaseDiff > PI) phaseDiff -= 2*PI;
-                phaseDiff = abs(phaseDiff);
-
                 // determine sound field x-position
                 m_xFs[f] = ampDiff;
 

mythtv/libs/libmythfreesurround/el_processor.h → mythtv/libs/libmyth/audio/freesurround_decoder.h

@@ -16,8 +16,8 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef EL_PROCESSOR_H
-#define EL_PROCESSOR_H
+#ifndef FREESURROUND_DECODER_H
+#define FREESURROUND_DECODER_H
 
 // the Free Surround decoder
 class fsurround_decoder {

mythtv/libs/libmyth/libmyth.pro

@@ -36,6 +36,8 @@ HEADERS += audio/audiooutputdigitalencoder.h audio/spdifencoder.h
 HEADERS += audio/audiosettings.h audio/audiooutputsettings.h audio/pink.h
 HEADERS += audio/volumebase.h audio/eldutils.h
 HEADERS += audio/audiooutputgraph.h
+HEADERS += audio/freesurround.h
+HEADERS += audio/freesurround_decoder.h
 HEADERS += backendselect.h dbsettings.h
 HEADERS += mythaverror.h mythcontext.h
 HEADERS += mythexp.h
@@ -50,6 +52,8 @@ SOURCES += audio/audioconvert.cpp
 SOURCES += audio/audiosettings.cpp audio/audiooutputsettings.cpp audio/pink.cpp
 SOURCES += audio/volumebase.cpp audio/eldutils.cpp
 SOURCES += audio/audiooutputgraph.cpp
+SOURCES += audio/freesurround.cpp
+SOURCES += audio/freesurround_decoder.cpp
 SOURCES += backendselect.cpp dbsettings.cpp
 SOURCES += mythaverror.cpp mythcontext.cpp
 SOURCES += output.cpp
@@ -61,7 +65,6 @@ INCLUDEPATH += $${POSTINC}
 LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
 LIBS += -L../libmythupnp         -lmythupnp-$${LIBVERSION}
-LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
 LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
 LIBS += -L../../external/FFmpeg/libavutil  -lmythavutil
 LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
@@ -78,7 +81,6 @@ LIBS += -L../libmythservicecontracts         -lmythservicecontracts-$${LIBVERSIO
     POST_TARGETDEPS += ../../external/FFmpeg/libswresample/$$avLibName(swresample)
     POST_TARGETDEPS += ../../external/FFmpeg/libavutil/$$avLibName(avutil)
     POST_TARGETDEPS += ../../external/FFmpeg/libavcodec/$$avLibName(avcodec)
-    POST_TARGETDEPS += ../libmythfreesurround/libmythfreesurround-$${MYTH_LIB_EXT}
 }
 
 # Install headers so that plugins can compile independently

mythtv/libs/libmythmetadata/CMakeLists.txt

@@ -107,7 +107,6 @@ target_link_libraries(
          mythbase
          mythui
          mythservicecontracts
-         mythfreesurround
          mythtv
          myth)
 

mythtv/libs/libmythmetadata/libmythmetadata.pro

@@ -45,7 +45,6 @@ INCLUDEPATH += $${CONFIG_TAGLIB_INCLUDES}
 LIBS += -L../libmythbase           -lmythbase-$${LIBVERSION}
 LIBS += -L../libmythui           -lmythui-$${LIBVERSION}
 LIBS += -L../libmythservicecontracts -lmythservicecontracts-$${LIBVERSION}
-LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
 LIBS += -L../../external/FFmpeg/libswresample -lmythswresample
 LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
 LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec

mythtv/libs/libs.pro

@@ -3,7 +3,7 @@ include (../settings.pro)
 TEMPLATE = subdirs
 
 # Libraries without dependencies
-SUBDIRS += libmythfreesurround libmythbase
+SUBDIRS += libmythbase
 SUBDIRS += libmythservicecontracts
 libmythservicecontracts.depends = libmythbase
 
@@ -16,7 +16,6 @@ SUBDIRS += libmythui libmythupnp libmyth
 libmythui.depends = libmythbase
 libmythupnp.depends = libmythbase libmythservicecontracts
 libmyth.depends =  libmythbase libmythui libmythupnp
-libmyth.depends += libmythfreesurround
 
 LIBMYTHTVDEPS = $$SUBDIRS