Merge pull request #7 from radiofrance/feat-upgrade-rf-liquidsoap-scr…

…ipts-to-v2.0.0

feat: release v2.0.0

.res/info.txt

@@ -22,7 +22,7 @@ srt://127.0.0.1:10014             # Liquidsoap (myradiosurround) SRT input port
 srt://127.0.0.1:10015             # Liquidsoap (myradiosurround) SRT input port override_caller2
 srt://127.0.0.1:10016             # Liquidsoap (myradiosurround) SRT input port sat_sat1
 
-# Liquidsoap streamer (source-mystreamer)
+# Liquidsoap surround SRT streamer (source-mystreamersurround)
 http://127.0.0.1:9021/metrics     # Liquidsoap (myradiosurround) Prometheus Metrics
 http://127.0.0.1:7020/livesource  # Liquidsoap (myradiosurround) HTTP API
 
@@ -33,15 +33,17 @@ http://127.0.0.1:8000/myradio-midfi.aac          # Icecast mountpoint (AAC midfi
 http://127.0.0.1:8000/myradio-lofi.aac           # Icecast mountpoint (AAC lofi)
 http://127.0.0.1:8000/myradio-midfi.mp3          # Icecast mountpoint (MP3 midfi)
 http://127.0.0.1:8000/myradio-lofi.mp3           # Icecast mountpoint (MP3 lofi)
-http://127.0.0.1:8000/myradiosurround-hifi.aac   # Icecast mountpoint (AAC hifi surround)
+http://127.0.0.1:8000/myradiosurround-insane.aac # Icecast mountpoint (AAC insane 320kbps 5.1)
 
 # NGINX (HLS, only AAC audio)
 http://127.0.0.1:8080                             # Browse HLS files
 http://127.0.0.1:8080/myradio/myradio.m3u8        # HLS playlist
 http://127.0.0.1:8080/myradio/myradio_hifi.m3u8   # HLS playlist (enforce hifi)
 http://127.0.0.1:8080/myradio/myradio_midfi.m3u8  # HLS playlist (enforce midfi)
 http://127.0.0.1:8080/myradio/myradio_lofi.m3u8   # HLS playlist (enforce lofi)
-http://127.0.0.1:8080/myradiosurround/myradiosurround_hifi.m3u8   # HLS playlist (enforce lofi)
+
+http://127.0.0.1:8080/myradiosurround/myradiosurround.m3u8          # HLS playlist
+http://127.0.0.1:8080/myradiosurround/myradiosurround_insane.m3u8   # HLS playlist (enforce insane profile)
 
 # Prometheus
 http://127.0.0.1:9090           # Prometheus web interface
@@ -53,4 +55,4 @@ http://127.0.0.1:3000           # Grafana web interface
 curl -s -d override_caller1 http://127.0.0.1:7000/livesource
 
 # Switch livesource for myradiosurround (please replace override_caller1 with anything you need)
-curl -s -d override_caller1 http://127.0.0.1:7010/livesource
+curl -s -d voieB_caller1 http://127.0.0.1:7010/livesource

CHANGELOG.md

@@ -1,40 +1,64 @@
 # CHANGELOG.md
 
-## unreleased / no tag
+## 2.0.0 (2023-11-06)
 
 Features:
 
-- Add new dashboard for LUFS levels
-- Add new graphs in liquidsoap dashboard for SRT inputs, packet loss, drops...
-- improve README.md
-- Improve docker-compose.yml, Makefile and examples
-- Improve CHANGELOG.md
-- Add GREETINGS.md
+- split scripts for different liquidsoap usages, transcoder (to produce a radio
+  stream) and streamer (to send audio to a transcoder with SRT, and serve
+  playlists or network sources - WIP).
+- add surround profiles for 5.1 streaming.
+- add insane AAC quality profile (aac/fdk_aac lc 320kbps).
+- support disabling HLS or Icecast outputs completely (removing all qualities).
+- remove test file and use example configs by default for tests.
+- upgrade liquidsoap to v2.2.2
+- add new srtcaller containers in docker-compose.yml, one to stream local files
+  with ffmpeg, another one to stream a local playlist with liquidsoap and a m3u
+  file.
+
+Breaking changes:
+
+- Some variables have been renamed in the configuration file.
+- A new function must be declared in the configuration file to select a channel
+  layout (stereo or surround).
+- scripts paths have changed, be careful if you use the scripts folder directly.
+
+## 1.2.1 (2023-09-06)
+
+Features:
+
+- Add new dashboard for LUFS levels.
+- Add new graphs in liquidsoap dashboard for SRT inputs, packet loss, drops, etc.
+- improve README.md.
+- Improve docker-compose.yml, Makefile and examples.
+- Improve CHANGELOG.md.
+- Add GREETINGS.md.
+- upgrade liquidsoap to v2.2.1.
 
 ## 1.0.6 (2023-04-18)
 
 Features:
 
-- Add a prometheus metric to monitor LUFS levels of final radio stream
+- add a prometheus metric to monitor LUFS levels of final radio stream.
 
 ## 1.0.5 (2023-04-05)
 
 Bugfix:
 
-- Prevent freezes of the main loop protecting input sources with a buffer.
+- prevent freezes of the main loop protecting input sources with a buffer.
   We were experiencing icecast server restarts due to this issue.
 
 ## 1.0.4 (2023-03-17)
 
 Features:
 
-- add new SRT and input buffer metrics
-- add a Makefile
-- improve docker-compose.yml
+- add new SRT and input buffer metrics.
+- add a Makefile.
+- improve docker-compose.yml.
 
 # Known issues
 
-- Situations where SRT inputs get stuck with "No room to store incoming packets"
+- situations where SRT inputs get stuck with "No room to store incoming packets"
   when sources are flapping / restarting too fast / due to network errors.
 
 - SRT input buffers tend to get consumed faster than the source is able to

Makefile

@@ -12,18 +12,32 @@ artifact: ## Build binary artifact
 	@md5sum rf-liquidsoap-$(version).tar.gz
 
 test: ## Run test on the liquidsoap configuration
-	@docker compose up liquidsoap-test-transcoder liquidsoap-test-streamer
+	@docker compose up \
+		liquidsoap-test-transcoder-stereo \
+		liquidsoap-test-streamer-stereo \
+		liquidsoap-test-transcoder-surround \
+	  liquidsoap-test-streamer-surround
 
 reload: ## Update containers if needed and restart all liquidsoaps
 	@docker compose up -d
-	@docker compose restart liquidsoap-test-transcoder liquidsoap-test-streamer
-	@docker compose restart liquidsoap-myradio liquidsoap-myradiosurround source-mystreamer
+	@docker compose restart \
+		liquidsoap-test-transcoder-stereo \
+		liquidsoap-test-streamer-stereo \
+		liquidsoap-test-transcoder-surround \
+	  liquidsoap-test-streamer-surround
+	@docker compose restart \
+		liquidsoap-myradio \
+		liquidsoap-myradiosurround \
+		# source-mystreamer \
+		source-mystreamersurround \
 	@docker compose ps
 	@docker compose logs -f
 
-reload-streamer: ## Update containers if needed and restart source-mystreamer
+reload-streamers: ## Update containers if needed and restart source-mystreamersurround
 	@docker compose up -d
-	@docker compose restart source-mystreamer
+	@docker compose restart \
+		# source-mystreamer \
+		source-mystreamersurround
 	@docker compose ps
 	@docker compose logs -f