fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-06-05 21:59:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix for gcc <= 5.5

Browse Source
This commit is contained in:
Christian R. Helmrich
2020-04-12 02:00:03 +02:00
parent 42b912d3c4
commit 1ae1312c72
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/exhaleApp.cpp
View File

@@ -448,7 +448,7 @@ int main (const int argc, char* argv[])
} }
if (bwMax < bw) bwMax = bw; if (bwMax < bw) bwMax = bw;
// write first AU, add frame to header // write first AU, add frame to header
if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength)) if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
{ {
#if USE_EXHALELIB_DLL #if USE_EXHALELIB_DLL
exhaleDelete (&exhaleEnc); exhaleDelete (&exhaleEnc);
@@ -471,7 +471,7 @@ int main (const int argc, char* argv[])
} }
if (bwMax < bw) bwMax = bw; if (bwMax < bw) bwMax = bw;
// write new AU, add frame to header // write new AU, add frame to header
if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength)) if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
{ {
#if USE_EXHALELIB_DLL #if USE_EXHALELIB_DLL
exhaleDelete (&exhaleEnc); exhaleDelete (&exhaleEnc);
@@ -501,7 +501,7 @@ int main (const int argc, char* argv[])
} }
if (bwMax < bw) bwMax = bw; if (bwMax < bw) bwMax = bw;
// write final AU, add frame to header // write final AU, add frame to header
if ((mp4Writer.addFrameAU (outAuData, bw) != bw) || loudnessEst.addNewPcmData (frameLength)) if ((mp4Writer.addFrameAU (outAuData, bw) != (int) bw) || loudnessEst.addNewPcmData (frameLength))
{ {
#if USE_EXHALELIB_DLL #if USE_EXHALELIB_DLL
exhaleDelete (&exhaleEnc); exhaleDelete (&exhaleEnc);
@@ -528,7 +528,7 @@ int main (const int argc, char* argv[])
} }
if (bwMax < bw) bwMax = bw; if (bwMax < bw) bwMax = bw;
// the flush AU, add frame to header // the flush AU, add frame to header
if (mp4Writer.addFrameAU (outAuData, bw) != bw) // zero, no loudness update if (mp4Writer.addFrameAU (outAuData, bw) != (int) bw) // no loudness update
{ {
#if USE_EXHALELIB_DLL #if USE_EXHALELIB_DLL
exhaleDelete (&exhaleEnc); exhaleDelete (&exhaleEnc);

2
src/lib/exhaleEnc.cpp
View File

@@ -1238,7 +1238,7 @@ unsigned ExhaleEncoder::spectralProcessing () // complete ics_info(), calc TNS
m_perCorrCurr[el] = (uint8_t) __max (prevPerCorr - allowedDiff, __min (prevPerCorr + allowedDiff, currPerCorr)); m_perCorrCurr[el] = (uint8_t) __max (prevPerCorr - allowedDiff, __min (prevPerCorr + allowedDiff, currPerCorr));
} }
if (s == steAnaStats * -1) coreConfig.stereoConfig = 2; // 2: side > mid, pred_dir=1 if ((int) s == steAnaStats * -1) coreConfig.stereoConfig = 2; // 2: S>M, pred_dir=1
if (s > (UCHAR_MAX * 3) / 4) coreConfig.stereoMode = 2; // 2: all, ms_mask_present=2 if (s > (UCHAR_MAX * 3) / 4) coreConfig.stereoMode = 2; // 2: all, ms_mask_present=2
} }
else if (nrChannels > 1) m_perCorrCurr[el] = 128; // update history with halfway value else if (nrChannels > 1) m_perCorrCurr[el] = 128; // update history with halfway value

2
src/makefile.base
View File

@@ -42,7 +42,7 @@ RELEASE_OBJS = $(OBJS:.o=.r.o)
## specification of compiler flags ## specification of compiler flags
CPPFLAGS = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wno-sign-compare -Wshadow -D_FILE_OFFSET_BITS=64 CPPFLAGS = -fPIC $(DEFS) -I$(CURDIR)/$(DIR_INC) -Wall -Werror -Wshadow -D_FILE_OFFSET_BITS=64 -std=c++11
# setting of 32-bit compiler flags # setting of 32-bit compiler flags
MM32?=0 MM32?=0