From 963cc1c45b5945b7ff601622521673a8848e38f7 Mon Sep 17 00:00:00 2001
From: Youenn Piolet <piolet.y@gmail.com>
Date: Tue, 12 Mar 2024 13:58:55 +0100
Subject: [PATCH] fix(formats): use real codec names for aac formats, files and
 fix profiles

---
 example/liquidsoap/myradiosurround.liq                 |  2 +-
 scripts/transcoder/30-formats.liq                      | 10 +++++-----
 .../transcoder/formats/{hls-aac.liq => hls.aac.liq}    |  2 +-
 .../formats/{hls-fdkaac.liq => hls.libfdk_aac.liq}     |  4 ++--
 .../formats/{icecast-aac.liq => icecast.aac.liq}       |  0
 .../{icecast-fdkaac.liq => icecast.libfdk_aac.liq}     |  4 ++--
 .../formats/{icecast-mp3.liq => icecast.mp3.liq}       |  0
 scripts/transcoder/outputs/hls.liq                     |  4 ++--
 scripts/transcoder/outputs/icecast.liq                 |  4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)
 rename scripts/transcoder/formats/{hls-aac.liq => hls.aac.liq} (97%)
 rename scripts/transcoder/formats/{hls-fdkaac.liq => hls.libfdk_aac.liq} (93%)
 rename scripts/transcoder/formats/{icecast-aac.liq => icecast.aac.liq} (100%)
 rename scripts/transcoder/formats/{icecast-fdkaac.liq => icecast.libfdk_aac.liq} (94%)
 rename scripts/transcoder/formats/{icecast-mp3.liq => icecast.mp3.liq} (100%)

diff --git a/example/liquidsoap/myradiosurround.liq b/example/liquidsoap/myradiosurround.liq
index 7d652d4..cc5ad7b 100644
--- 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
index b3d3847..d9da511 100644
--- 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 b/scripts/transcoder/formats/hls.aac.liq
similarity index 97%
rename from scripts/transcoder/formats/hls-aac.liq
rename to scripts/transcoder/formats/hls.aac.liq
index 79d8bba..91e82fd 100644
--- a/scripts/transcoder/formats/hls-aac.liq
+++ b/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 b/scripts/transcoder/formats/hls.libfdk_aac.liq
similarity index 93%
rename from scripts/transcoder/formats/hls-fdkaac.liq
rename to scripts/transcoder/formats/hls.libfdk_aac.liq
index e45497f..63cbfcf 100644
--- a/scripts/transcoder/formats/hls-fdkaac.liq
+++ b/scripts/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 b/scripts/transcoder/formats/icecast.aac.liq
similarity index 100%
rename from scripts/transcoder/formats/icecast-aac.liq
rename to scripts/transcoder/formats/icecast.aac.liq
diff --git a/scripts/transcoder/formats/icecast-fdkaac.liq b/scripts/transcoder/formats/icecast.libfdk_aac.liq
similarity index 94%
rename from scripts/transcoder/formats/icecast-fdkaac.liq
rename to scripts/transcoder/formats/icecast.libfdk_aac.liq
index 4aba533..c47634f 100644
--- a/scripts/transcoder/formats/icecast-fdkaac.liq
+++ b/scripts/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 b/scripts/transcoder/formats/icecast.mp3.liq
similarity index 100%
rename from scripts/transcoder/formats/icecast-mp3.liq
rename to scripts/transcoder/formats/icecast.mp3.liq
diff --git a/scripts/transcoder/outputs/hls.liq b/scripts/transcoder/outputs/hls.liq
index b3d1614..021522a 100644
--- 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
index d85b499..8fc6ad2 100644
--- 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