Removed some hard-coded defaults.

kmcclive · Mar 2, 2021 · b8d6a3a · b8d6a3a
1 parent 5d8b69b
commit b8d6a3a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Tricycle.Media.FFmpeg/MediaTranscoder.cs b/Tricycle.Media.FFmpeg/MediaTranscoder.cs
@@ -210,11 +210,11 @@ protected virtual Codec GetVideoCodec(FFmpegConfig config,
                                               VideoOutputStream outputStream)
         {
             VideoFormat format = outputStream.Format;
-            VideoCodec codec = config?.Video?.Codecs.GetValueOrDefault(format) ?? new VideoCodec("medium");
+            VideoCodec codec = config?.Video?.Codecs.GetValueOrDefault(format);
             string codecName = GetVideoCodecName(format);
             X26xCodec result = format == VideoFormat.Hevc ? new X265Codec(codecName) : new X26xCodec(codecName);
 
-            result.Preset = codec.Preset;
+            result.Preset = codec?.Preset;
             result.Crf = outputStream.Quality;
 
             if (outputStream.DynamicRange == DynamicRange.High)

diff --git a/Tricycle.UI/ViewModels/ConfigViewModel.cs b/Tricycle.UI/ViewModels/ConfigViewModel.cs
@@ -574,8 +574,8 @@ TricycleConfig GenerateTricycleConfig()
                 Video = GenerateTricycleVideoConfig(),
                 DefaultFileExtensions = new Dictionary<ContainerFormat, string>()
                 {
-                    { ContainerFormat.Mp4, string.IsNullOrWhiteSpace(Mp4FileExtension) ? "mp4" : Mp4FileExtension },
-                    { ContainerFormat.Mkv, string.IsNullOrWhiteSpace(MkvFileExtension) ? "mkv" : MkvFileExtension }
+                    { ContainerFormat.Mp4, Mp4FileExtension },
+                    { ContainerFormat.Mkv, MkvFileExtension }
                 },
                 DestinationDirectoryMode = (AutomationMode)SelectedDestinationDirectoryMode.Value,
                 DestinationDirectory = DestinationDirectory,
@@ -718,14 +718,14 @@ FFmpegAudioConfig GenerateFFmpegAudioConfig()
                             AudioFormat.Aac,
                             new FFmpegAudioCodec()
                             {
-                                Name = string.IsNullOrWhiteSpace(AacCodec) ? "aac" : AacCodec
+                                Name = AacCodec
                             }
                         },
                         {
                             AudioFormat.Ac3,
                             new FFmpegAudioCodec()
                             {
-                                Name = string.IsNullOrWhiteSpace(Ac3Codec) ? "ac3" : Ac3Codec
+                                Name = Ac3Codec
                             }
                         }
                     }
@@ -742,21 +742,21 @@ FFmpegVideoConfig GenerateFFmpegVideoConfig()
                         VideoFormat.Avc,
                         new FFmpegVideoCodec()
                         {
-                            Preset = SelectedX264Preset?.ToString() ?? "medium"
+                            Preset = SelectedX264Preset?.ToString()
                         }
                     },
                     {
                         VideoFormat.Hevc,
                         new FFmpegVideoCodec()
                         {
-                            Preset = SelectedX265Preset?.ToString() ?? "medium",
+                            Preset = SelectedX265Preset?.ToString()
                         }
                     }
                 },
-                CropDetectOptions = string.IsNullOrWhiteSpace(CropDetectOptions) ? null : CropDetectOptions,
-                DeinterlaceOptions = string.IsNullOrWhiteSpace(DeinterlaceOptions) ? "bwdif" : DeinterlaceOptions,
-                DenoiseOptions = string.IsNullOrWhiteSpace(DenoiseOptions) ? "hqdn3d=4:4:3:3" : DenoiseOptions,
-                TonemapOptions = string.IsNullOrWhiteSpace(TonemapOptions) ? "hable:desat=0" : TonemapOptions
+                CropDetectOptions = CropDetectOptions,
+                DeinterlaceOptions = DeinterlaceOptions,
+                DenoiseOptions = DenoiseOptions,
+                TonemapOptions = TonemapOptions
             };
         }