From 878d392f8abdf040bb1dfc46b24e61bb8a95c941 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Mon, 25 Sep 2023 09:21:57 -0300
Subject: [PATCH] audiofilter: get fmt name from ffmpeg
Change-Id: I6b618bd841b622add69f50846b7c25923b941086
---
AudioFilter/CMakeLists.txt | 2 +-
AudioFilter/FilterAudioSubscriber.cpp | 21 ++++-----------------
AudioFilter/manifest.json | 4 ++--
AudioFilter/package.json | 2 +-
daemon | 2 +-
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/AudioFilter/CMakeLists.txt b/AudioFilter/CMakeLists.txt
index c1c59f4..36309e8 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 0096c17..5b42c01 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 c08e558..25e82c7 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 b3d39c3..6c98d60 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 dc2697c..f19b0fa 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit dc2697c3de77301d3881d01741c912a70226892e
+Subproject commit f19b0fad9b99181e9a5e5a892ae354d940db2bb2
--
GitLab