fenix/exhale
1
0
Fork 0
mirror of https://gitlab.com/ecodis/exhale.git synced 2025-03-12 17:20:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix gcc compilation

Browse Source
This commit is contained in:
Christian R. Helmrich 2020-02-28 12:00:12 +01:00
parent 1ed3e96e81
commit 11ac123906
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/exhaleApp.cpp
View File

@ -27,12 +27,6 @@
#if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64) #if defined (_WIN32) || defined (WIN32) || defined (_WIN64) || defined (WIN64)
#include <windows.h> #include <windows.h>
// constants, experimental macros
#define EA_LOUD_INIT 16399u // bsSamplePeakLevel = 0 & methodValue = 0
#define EA_LOUD_NORM -42.25f // -100 + 57.75 of ISO 23003-4, Table A.48
#define EA_PEAK_NORM -96.33f // 20 * log10(2^-16), 16-bit normalization
#define EA_PEAK_MIN 0.262f // 20 * log10() + EA_PEAK_NORM = -108 dbFS
#define EXHALE_TEXT_BLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_GREEN) #define EXHALE_TEXT_BLUE (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_GREEN)
#define EXHALE_TEXT_PINK (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_RED) #define EXHALE_TEXT_PINK (FOREGROUND_INTENSITY | FOREGROUND_BLUE | FOREGROUND_RED)
#else // Linux, MacOS, Unix #else // Linux, MacOS, Unix
@ -40,6 +34,12 @@
#define EXHALE_TEXT_BLUE "\x1b[36m" #define EXHALE_TEXT_BLUE "\x1b[36m"
#define EXHALE_TEXT_PINK "\x1b[35m" #define EXHALE_TEXT_PINK "\x1b[35m"
#endif #endif
// constants, experimental macros
#define EA_LOUD_INIT 16399u // bsSamplePeakLevel = 0 & methodValue = 0
#define EA_LOUD_NORM -42.25f // -100 + 57.75 of ISO 23003-4, Table A.48
#define EA_PEAK_NORM -96.33f // 20 * log10(2^-16), 16-bit normalization
#define EA_PEAK_MIN 0.262f // 20 * log10() + EA_PEAK_NORM = -108 dbFS
#define IGNORE_WAV_LENGTH 0 // 1: ignore input size indicators (nasty) #define IGNORE_WAV_LENGTH 0 // 1: ignore input size indicators (nasty)
#define XHE_AAC_LOW_DELAY 0 // 1: allow encoding with 768 frame length #define XHE_AAC_LOW_DELAY 0 // 1: allow encoding with 768 frame length
@ -591,7 +591,7 @@ int main (const int argc, char* argv[])
if (numChannels < 7) if (numChannels < 7)
{ {
fprintf_s (stdout, " Input statistics: Mobile loudness %.2f LUFS,\tsample peak level %.2f dBFS\n\n", fprintf_s (stdout, " Input statistics: Mobile loudness %.2f LUFS,\tsample peak level %.2f dBFS\n\n",
(loudStats >> 16) / 512.f - 100.0f, 20.0f * log10 (__max (EA_PEAK_MIN, float (loudStats & USHRT_MAX))) + EA_PEAK_NORM); __max (3u, loudStats >> 16) / 512.f - 100.0f, 20.0f * log10 (__max (EA_PEAK_MIN, float (loudStats & USHRT_MAX))) + EA_PEAK_NORM);
} }
if (!readStdin && (actualLength != expectLength || bw != headerRes)) if (!readStdin && (actualLength != expectLength || bw != headerRes))

4
src/app/exhaleApp.rc
View File

@ -1,5 +1,5 @@
/* exhaleApp.rc - resource file for exhale application binaries compiled under Windows /* exhaleApp.rc - resource file for exhale application binaries compiled under Windows
* written by C. R. Helmrich, last modified in 2019 - see License.htm for legal notices * written by C. R. Helmrich, last modified in 2020 - see License.htm for legal notices
* *
* The copyright in this software is being made available under a Modified BSD-Style License * The copyright in this software is being made available under a Modified BSD-Style License
* and comes with ABSOLUTELY NO WARRANTY. This software may be subject to other third- * and comes with ABSOLUTELY NO WARRANTY. This software may be subject to other third-
@ -13,7 +13,7 @@
0 ICON "exhaleApp.ico" 0 ICON "exhaleApp.ico"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,0 FILEVERSION 1,0,1
BEGIN BEGIN
BLOCK "StringFileInfo" BLOCK "StringFileInfo"
BEGIN BEGIN

1
src/app/exhaleAppPch.h
View File

@ -12,6 +12,7 @@
#define _EXHALE_APP_PCH_H_ #define _EXHALE_APP_PCH_H_
#include <limits.h> // for .._MAX, .._MIN #include <limits.h> // for .._MAX, .._MIN
#include <math.h> // for log, pow, sqrt
#include <stdint.h> // for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t #include <stdint.h> // for (u)int8_t, (u)int16_t, (u)int32_t, (u)int64_t
#include <stdlib.h> // for abs, div, calloc, malloc, free, (__)max, (__)min, (s)rand #include <stdlib.h> // for abs, div, calloc, malloc, free, (__)max, (__)min, (s)rand
#include <string.h> // for memcpy, memset #include <string.h> // for memcpy, memset