diff --git a/assets/ffplayout.yml b/assets/ffplayout.yml index 3191a48e..573ea462 100644 --- a/assets/ffplayout.yml +++ b/assets/ffplayout.yml @@ -117,13 +117,10 @@ text: out: help_text: The final playout compression. Set the settings to your needs. 'mode' - has the options 'desktop', 'hls', 'null', 'stream'. In 'custom_filter' it is possible - to define custom ffmpeg filters. They need to end with [c_v_out] for video filter, - and [c_a_out] for audio filter. Use 'stream' and adjust 'output_param:' settings when - you want to stream to a rtmp/rtsp/srt/... server. In production don't serve hls - playlist with ffpapi, use nginx or another web server! + has the options 'desktop', 'hls', 'null', 'stream'. Use 'stream' and adjust + 'output_param:' settings when you want to stream to a rtmp/rtsp/srt/... server. + In production don't serve hls playlist with ffpapi, use nginx or another web server! mode: desktop - custom_filter: output_param: >- -c:v libx264 -crf 23 diff --git a/docs/custom_filters.md b/docs/custom_filters.md index e45e6896..fa0b7000 100644 --- a/docs/custom_filters.md +++ b/docs/custom_filters.md @@ -38,16 +38,7 @@ File -> | Decoder / Filtering / custom filter |------------| Encoder / text over Loop +-------------------------------------+ +------------------------+ ``` -The **custom filter** from **config -> out** got applied on the encoder side: - -``` - +---------------------+ PIPE +----------------------------------------+ -File -> | Decoder / Filtering |------------| Encoder / text overlay / custom filter | -> Output -Loop +---------------------+ +----------------------------------------+ -``` - #### When which one to take * If you want to use for every clip a different filter chain, you should use the custom filter parameter from **playlist**. * When you want to use the same filter for every clip you can use the custom filter from **config -> processing**. -* If you need a global filter for all clips, which has movements, like a animated logo, or different lower thirds, you should use the custom filter from **config -> out**. diff --git a/ffplayout-frontend b/ffplayout-frontend index cb208173..37ccb38b 160000 --- a/ffplayout-frontend +++ b/ffplayout-frontend @@ -1 +1 @@ -Subproject commit cb20817330c5fd837eec1ae5716aa60f28f2b973 +Subproject commit 37ccb38b91b34095d06673952a913be3cf79eb0a