diff --git a/AudioFilter/CMakeLists.txt b/AudioFilter/CMakeLists.txt index c1c59f40c2f6272fccb226ebec5e8d6ebb83c4ae..36309e834c528c692bd578e489e34277c952f16e 100644 --- a/AudioFilter/CMakeLists.txt +++ b/AudioFilter/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) # set the project name set (ProjectName AudioFilter) -set (Version 1.0.1) +set (Version 1.0.2) project(${ProjectName} VERSION ${Version}) diff --git a/AudioFilter/FilterAudioSubscriber.cpp b/AudioFilter/FilterAudioSubscriber.cpp index 0096c17e699288b5cc194c2dfbb4e3969b224c82..5b42c018b7f045d8787e61982a2ef9e491cf4034 100644 --- a/AudioFilter/FilterAudioSubscriber.cpp +++ b/AudioFilter/FilterAudioSubscriber.cpp @@ -63,26 +63,13 @@ FilterAudioSubscriber::setFilterDescription(const int pSampleRate, const int pSa { int rSamples = 1024; // due to afir internal fifo int midSampleRate = pSampleRate * rSamples / pSamples; - std::string outFormat {"s16"}; - if (pFormat == AV_SAMPLE_FMT_U8) - outFormat = "u8"; - else if (pFormat == AV_SAMPLE_FMT_S32) - outFormat = "s32"; - else if (pFormat == AV_SAMPLE_FMT_FLT) - outFormat = "f32"; - else if (pFormat == AV_SAMPLE_FMT_DBL) - outFormat = "f64"; + std::string outFormat = av_get_sample_fmt_name((AVSampleFormat)pFormat); filterDescription_ = "[ input ] aformat=sample_fmts=s16:sample_rates=" + std::to_string(midSampleRate) + ":channel_layouts=stereo [ resample1 ] , " - "[ resample1 ] [ ir0 ] afir=maxir=1:wet=10:dry=10:irgain=1:irfmt=mono:maxp=" - + std::to_string(rSamples) + ":minp=" + std::to_string(rSamples) - + " [ reverb ] , " -#ifdef __DEBUG__ - "[ reverb ] aformat=sample_fmts=" + outFormat + "p:sample_rates=" -#else - "[ reverb ] aformat=sample_fmts=" + outFormat + ":sample_rates=" -#endif + + "[ resample1 ] [ ir0 ] afir=maxir=1:wet=10:dry=10:irgain=1:irfmt=mono:maxp=" + + std::to_string(rSamples) + ":minp=" + std::to_string(rSamples) + " [ reverb ] , " + + "[ reverb ] aformat=sample_fmts=" + outFormat + ":sample_rates=" + std::to_string(pSampleRate) + ":channel_layouts=stereo "; } diff --git a/AudioFilter/manifest.json b/AudioFilter/manifest.json index c08e558d6550b110b716bbb30cc6ee149119f78d..25e82c76b91a3725ffa1704e306bdafff0b3db7f 100644 --- a/AudioFilter/manifest.json +++ b/AudioFilter/manifest.json @@ -2,7 +2,7 @@ "id": "AudioFilter", "name": "{{name}}", "description": "{{description_summary}}", - "version": "1.0.1", - "iconPath" : "icon.svg", + "version": "1.0.2", + "iconPath": "icon.svg", "backgroundPath": "background.jpg" } \ No newline at end of file diff --git a/AudioFilter/package.json b/AudioFilter/package.json index b3d39c3b8ba6025c28a803e25718a20af4084d56..6c98d600233d73341711f566b2bdb65579d8641d 100644 --- a/AudioFilter/package.json +++ b/AudioFilter/package.json @@ -1,6 +1,6 @@ { "name": "AudioFilter", - "version": "1.0.1", + "version": "1.0.2", "extractLibs": false, "deps": [ "fmt", diff --git a/daemon b/daemon index dc2697c3de77301d3881d01741c912a70226892e..f19b0fad9b99181e9a5e5a892ae354d940db2bb2 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit dc2697c3de77301d3881d01741c912a70226892e +Subproject commit f19b0fad9b99181e9a5e5a892ae354d940db2bb2