majomi/intro-skipper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All platforms ship with ffmpeg (#340)

Browse Source 
* All platforms ship with ffmpeg

This is no longer necessary as a workaround for ffmpeg without chromaprint.

* Remove an obsolete reference

* Reset existing user setting to "true"
This commit is contained in:
TwistedUmbrellaX 2024-10-10 11:38:47 -04:00 committed by GitHub
parent 49429b9ca4
commit f07134cc55
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ConfusedPolarBear.Plugin.IntroSkipper/Configuration/PluginConfiguration.cs
View File

@ -61,7 +61,7 @@ public class PluginConfiguration : BasePluginConfiguration
/// <summary> /// <summary>
/// Gets or sets a value indicating whether analysis will use Chromaprint to determine fingerprints. /// Gets or sets a value indicating whether analysis will use Chromaprint to determine fingerprints.
/// </summary> /// </summary>
public bool UseChromaprint { get; set; } = true; public bool WithChromaprint { get; set; } = true;
// ===== EDL handling ===== // ===== EDL handling =====

15
ConfusedPolarBear.Plugin.IntroSkipper/Configuration/configPage.html
View File

@ -269,20 +269,6 @@
<summary>Process Configuration</summary> <summary>Process Configuration</summary>
<br /> <br />
<div class="checkboxContainer checkboxContainer-withDescription">
<label class="emby-checkbox-label">
<input id="UseChromaprint" type="checkbox" is="emby-checkbox" />
<span>Chromaprint analysis</span>
</label>
<div class="fieldDescription">
If checked, analysis will use Chromaprint to compare episode audio and identify intros.
<br />
<strong>WARNING: Disabling this option may result in incomplete or innaccurate analysis!</strong>
<br />
</div>
</div>
<div class="checkboxContainer checkboxContainer-withDescription"> <div class="checkboxContainer checkboxContainer-withDescription">
<label class="emby-checkbox-label"> <label class="emby-checkbox-label">
<input id="CacheFingerprints" type="checkbox" is="emby-checkbox" /> <input id="CacheFingerprints" type="checkbox" is="emby-checkbox" />
@ -812,7 +798,6 @@
"AnalyzeSeasonZero", "AnalyzeSeasonZero",
"SelectAllLibraries", "SelectAllLibraries",
"RegenerateEdlFiles", "RegenerateEdlFiles",
"UseChromaprint",
"CacheFingerprints", "CacheFingerprints",
"AutoSkip", "AutoSkip",
"AutoSkipCredits", "AutoSkipCredits",

6
ConfusedPolarBear.Plugin.IntroSkipper/ScheduledTasks/BaseItemAnalyzerTask.cs
View File

@ -61,7 +61,7 @@ public class BaseItemAnalyzerTask
{ {
var ffmpegValid = FFmpegWrapper.CheckFFmpegVersion(); var ffmpegValid = FFmpegWrapper.CheckFFmpegVersion();
// Assert that ffmpeg with chromaprint is installed // Assert that ffmpeg with chromaprint is installed
if (Plugin.Instance!.Configuration.UseChromaprint && !ffmpegValid) if (Plugin.Instance!.Configuration.WithChromaprint && !ffmpegValid)
{ {
throw new FingerprintException( throw new FingerprintException(
"Analysis terminated! Chromaprint is not enabled in the current ffmpeg. If Jellyfin is running natively, install jellyfin-ffmpeg5. If Jellyfin is running in a container, upgrade to version 10.8.0 or newer."); "Analysis terminated! Chromaprint is not enabled in the current ffmpeg. If Jellyfin is running natively, install jellyfin-ffmpeg5. If Jellyfin is running in a container, upgrade to version 10.8.0 or newer.");
@ -211,7 +211,7 @@ public class BaseItemAnalyzerTask
new ChapterAnalyzer(_loggerFactory.CreateLogger<ChapterAnalyzer>()) new ChapterAnalyzer(_loggerFactory.CreateLogger<ChapterAnalyzer>())
}; };
if (first.IsAnime && Plugin.Instance!.Configuration.UseChromaprint) if (first.IsAnime && Plugin.Instance!.Configuration.WithChromaprint)
{ {
analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>())); analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>()));
} }
@ -221,7 +221,7 @@ public class BaseItemAnalyzerTask
analyzers.Add(new BlackFrameAnalyzer(_loggerFactory.CreateLogger<BlackFrameAnalyzer>())); analyzers.Add(new BlackFrameAnalyzer(_loggerFactory.CreateLogger<BlackFrameAnalyzer>()));
} }
if (!first.IsAnime && Plugin.Instance!.Configuration.UseChromaprint) if (!first.IsAnime && Plugin.Instance!.Configuration.WithChromaprint)
{ {
analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>())); analyzers.Add(new ChromaprintAnalyzer(_loggerFactory.CreateLogger<ChromaprintAnalyzer>()));
} }