diff --git a/AudioFilter/CMakeLists.txt b/AudioFilter/CMakeLists.txt index a7f024ac40d58061d04e017bf5956a21f6de1299..c1c59f40c2f6272fccb226ebec5e8d6ebb83c4ae 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.0) +set (Version 1.0.1) project(${ProjectName} VERSION ${Version}) diff --git a/AudioFilter/FilterAudioSubscriber.cpp b/AudioFilter/FilterAudioSubscriber.cpp index a1e41c32e3c41c388d5f5279a329c4ff3cbb9f8c..0096c17e699288b5cc194c2dfbb4e3969b224c82 100644 --- a/AudioFilter/FilterAudioSubscriber.cpp +++ b/AudioFilter/FilterAudioSubscriber.cpp @@ -59,10 +59,19 @@ FilterAudioSubscriber::setIRFile(const std::string& irFile) } void -FilterAudioSubscriber::setFilterDescription(const int pSampleRate, const int pSamples) +FilterAudioSubscriber::setFilterDescription(const int pSampleRate, const int pSamples, const int pFormat) { 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"; filterDescription_ = "[ input ] aformat=sample_fmts=s16:sample_rates=" + std::to_string(midSampleRate) + ":channel_layouts=stereo [ resample1 ] , " @@ -70,9 +79,9 @@ FilterAudioSubscriber::setFilterDescription(const int pSampleRate, const int pSa + std::to_string(rSamples) + ":minp=" + std::to_string(rSamples) + " [ reverb ] , " #ifdef __DEBUG__ - "[ reverb ] aformat=sample_fmts=s16p:sample_rates=" + "[ reverb ] aformat=sample_fmts=" + outFormat + "p:sample_rates=" #else - "[ reverb ] aformat=sample_fmts=s16:sample_rates=" + "[ reverb ] aformat=sample_fmts=" + outFormat + ":sample_rates=" #endif + std::to_string(pSampleRate) + ":channel_layouts=stereo "; } @@ -181,7 +190,7 @@ FilterAudioSubscriber::update(Observable<AVFrame*>*, AVFrame* const& pluginFrame return; if (firstRun) { - setFilterDescription(pluginFrame->sample_rate, pluginFrame->nb_samples); + setFilterDescription(pluginFrame->sample_rate, pluginFrame->nb_samples, pluginFrame->format); AudioFormat afmt_ = AudioFormat(pluginFrame->sample_rate, pluginFrame->ch_layout.nb_channels, static_cast<AVSampleFormat>(pluginFrame->format)); diff --git a/AudioFilter/FilterAudioSubscriber.h b/AudioFilter/FilterAudioSubscriber.h index b5ce8288a59ea8f1e73e6b18883103731a47cea6..a03ce6d239b051f021406dd1f7f753fde3484898 100644 --- a/AudioFilter/FilterAudioSubscriber.h +++ b/AudioFilter/FilterAudioSubscriber.h @@ -56,7 +56,7 @@ private: // Status variables of the processing bool firstRun {true}; - void setFilterDescription(const int pSampleRate, const int pSamples); + void setFilterDescription(const int pSampleRate, const int pSamples, const int pFormat); void setIRAVFrame(); AudioFormat getIRAVFrameInfos(); std::string irFile_{}; diff --git a/AudioFilter/main.cpp b/AudioFilter/main.cpp index 1a28e49906b9560d7f216699bf2dbebb63897612..797af99d41082352bd6200c6477cbba514cd692f 100644 --- a/AudioFilter/main.cpp +++ b/AudioFilter/main.cpp @@ -41,7 +41,7 @@ #define AudioFilter_VERSION_MAJOR 1 #define AudioFilter_VERSION_MINOR 0 -#define AudioFilter_VERSION_PATCH 0 +#define AudioFilter_VERSION_PATCH 1 extern "C" { diff --git a/AudioFilter/manifest.json b/AudioFilter/manifest.json index e09f37f7ac8744564ddeae9af9b99955c69ba988..c08e558d6550b110b716bbb30cc6ee149119f78d 100644 --- a/AudioFilter/manifest.json +++ b/AudioFilter/manifest.json @@ -2,7 +2,7 @@ "id": "AudioFilter", "name": "{{name}}", "description": "{{description_summary}}", - "version": "1.0.0", + "version": "1.0.1", "iconPath" : "icon.svg", "backgroundPath": "background.jpg" } \ No newline at end of file diff --git a/AudioFilter/package.json b/AudioFilter/package.json index b66c19e746eb51d6d6402a52cb34852dd996e1ab..b3d39c3b8ba6025c28a803e25718a20af4084d56 100644 --- a/AudioFilter/package.json +++ b/AudioFilter/package.json @@ -1,6 +1,6 @@ { "name": "AudioFilter", - "version": "1.0.0", + "version": "1.0.1", "extractLibs": false, "deps": [ "fmt",