timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

fix saving watermarks and graphics on playout items (#2313)

Browse Source
This commit is contained in:
Jason Dove
2025-08-13 19:37:46 +00:00
committed by GitHub
parent 8cc0d30c0e
commit 0841bc400b
6 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Core/FFmpeg/FFmpegProcessService.cs
+12
View File
@@ -199,6 +199,8 @@ public class FFmpegProcessService
break;
}
_logger.LogDebug("Watermark will come from playout item (custom)");
string customPath = _imageCache.GetPathForImage(
watermark.Image,
ArtworkKind.Watermark,
@@ -209,6 +211,8 @@ public class FFmpegProcessService
None,
await IsAnimated(ffprobePath, customPath));
case ChannelWatermarkImageSource.ChannelLogo:
_logger.LogDebug("Watermark will come from playout item (channel logo)");
Option<string> maybeChannelPath = channel.Artwork.Count == 0
?
//We have to generate the logo on the fly and save it to a local temp path
@@ -240,6 +244,8 @@ public class FFmpegProcessService
switch (channel.Watermark.ImageSource)
{
case ChannelWatermarkImageSource.Custom:
_logger.LogDebug("Watermark will come from channel (custom)");
string customPath = _imageCache.GetPathForImage(
channel.Watermark.Image,
ArtworkKind.Watermark,
@@ -250,6 +256,8 @@ public class FFmpegProcessService
None,
await IsAnimated(ffprobePath, customPath));
case ChannelWatermarkImageSource.ChannelLogo:
_logger.LogDebug("Watermark will come from channel (channel logo)");
Option<string> maybeChannelPath = channel.Artwork.Count == 0
?
//We have to generate the logo on the fly and save it to a local temp path
@@ -280,6 +288,8 @@ public class FFmpegProcessService
switch (watermark.ImageSource)
{
case ChannelWatermarkImageSource.Custom:
_logger.LogDebug("Watermark will come from global (custom)");
string customPath = _imageCache.GetPathForImage(
watermark.Image,
ArtworkKind.Watermark,
@@ -290,6 +300,8 @@ public class FFmpegProcessService
None,
await IsAnimated(ffprobePath, customPath));
case ChannelWatermarkImageSource.ChannelLogo:
_logger.LogDebug("Watermark will come from global (channel logo)");
Option<string> maybeChannelPath = channel.Artwork.Count == 0
?
//We have to generate the logo on the fly and save it to a local temp path