fix(formats): use read codec name for aac formats, rename files, fix …

…profiles
radiofrance · Mar 12, 2024 · 0fd3390 · 0fd3390
1 parent 853bb45
commit 0fd3390
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/example/liquidsoap/myradiosurround.liq b/example/liquidsoap/myradiosurround.liq
@@ -2,7 +2,7 @@ radio_name = "myradiosurround"
 
 # Radio settings
 formats_picker = fun (formats) -> formats.surround
-aac_encoder = "fdkaac"
+aac_encoder = "libfdk_aac"
 harbor_http_port = 7010
 prometheus_server_port = 9011
 liquidsoap_log_level = 3

diff --git a/scripts/transcoder/30-formats.liq b/scripts/transcoder/30-formats.liq
@@ -9,10 +9,10 @@ let formats = {
   }
 }
 
-%include "formats/hls-aac.liq"
-%include "formats/hls-fdkaac.liq"
-%include "formats/icecast-aac.liq"
-%include "formats/icecast-fdkaac.liq"
-%include "formats/icecast-mp3.liq"
+%include "formats/hls.aac.liq"
+%include "formats/hls.libfdk_aac.liq"
+%include "formats/icecast.aac.liq"
+%include "formats/icecast.libfdk_aac.liq"
+%include "formats/icecast.mp3.liq"
 
 formats = formats_picker(formats)
diff --git a/scripts/transcoder/formats/hls-aac.liq → scripts/transcoder/formats/hls.aac.liq b/scripts/transcoder/formats/hls-aac.liq → scripts/transcoder/formats/hls.aac.liq
@@ -54,7 +54,7 @@ let formats.surround.hls.aac = [
       channel_layout=5.1,
       b="192k",
       samplerate=48000,
-      profile="aac_he"
+      profile="aac_low"
     ))
  ),
  ("insane",

diff --git a/scripts/transcoder/formats/hls-fdkaac.liq → ...pts/transcoder/formats/hls.libfdk_aac.liq b/scripts/transcoder/formats/hls-fdkaac.liq → ...pts/transcoder/formats/hls.libfdk_aac.liq
@@ -1,4 +1,4 @@
-let formats.stereo.hls.fdkaac = [
+let formats.stereo.hls.libfdk_aac = [
  ("lofi",
   %ffmpeg(
     format="mpegts",
@@ -49,7 +49,7 @@ let formats.stereo.hls.fdkaac = [
  )
 ]
 
-let formats.surround.hls.fdkaac = [
+let formats.surround.hls.libfdk_aac = [
  ("hifi",
   %ffmpeg(
     format="mpegts",

diff --git a/scripts/transcoder/formats/icecast-aac.liq → scripts/transcoder/formats/icecast.aac.liq b/scripts/transcoder/formats/icecast-aac.liq → scripts/transcoder/formats/icecast.aac.liq
diff --git a/...pts/transcoder/formats/icecast-fdkaac.liq → ...transcoder/formats/icecast.libfdk_aac.liq b/...pts/transcoder/formats/icecast-fdkaac.liq → ...transcoder/formats/icecast.libfdk_aac.liq
@@ -1,4 +1,4 @@
-let formats.stereo.icecast.fdkaac = {
+let formats.stereo.icecast.libfdk_aac = {
  sub_formats = [
    ("lofi",
     %ffmpeg(
@@ -56,7 +56,7 @@ let formats.stereo.icecast.fdkaac = {
   file_extension = ".aac"
 }
 
-let formats.surround.icecast.fdkaac = {
+let formats.surround.icecast.libfdk_aac = {
  sub_formats = [
    ("hifi",
     %ffmpeg(

diff --git a/scripts/transcoder/formats/icecast-mp3.liq → scripts/transcoder/formats/icecast.mp3.liq b/scripts/transcoder/formats/icecast-mp3.liq → scripts/transcoder/formats/icecast.mp3.liq
diff --git a/scripts/transcoder/outputs/hls.liq b/scripts/transcoder/outputs/hls.liq
@@ -1,8 +1,8 @@
 # HLS output
 
 available_hls_formats =
-  if aac_encoder == "libfdkaac" then
-    formats.hls.fdkaac
+  if aac_encoder == "libfdk_aac" then
+    formats.hls.libfdk_aac
   else
     formats.hls.aac
   end

diff --git a/scripts/transcoder/outputs/icecast.liq b/scripts/transcoder/outputs/icecast.liq
@@ -1,7 +1,7 @@
 # Icecast output
 icecast_aac_encoder =
-  if aac_encoder == "libfdkaac" then
-    formats.icecast.fdkaac
+  if aac_encoder == "libfdk_aac" then
+    formats.icecast.libfdk_aac
   else
     formats.icecast.aac
   end