Browse Source

properly overwrite environment variables (#567)

pull/568/head
Jason Dove 4 years ago committed by GitHub
parent
commit
a4eac4feea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      CHANGELOG.md
  2. 10
      ErsatzTV.Core/FFmpeg/FFmpegProcessBuilder.cs

1
CHANGELOG.md

@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Fixed ### Fixed
- Properly index `minutes` field when adding new items during scan (vs when rebuilding index) - Properly index `minutes` field when adding new items during scan (vs when rebuilding index)
- Fix some nvenc edge cases where only padding is needed for normalization - Fix some nvenc edge cases where only padding is needed for normalization
- Properly overwrite environment variables for ffmpeg processes (`LIBVA_DRIVER_NAME`, `FFREPORT`)
### Added ### Added
- Add music video `artist` to search index - Add music video `artist` to search index

10
ErsatzTV.Core/FFmpeg/FFmpegProcessBuilder.cs

@ -633,13 +633,13 @@ namespace ErsatzTV.Core.FFmpeg
switch (_vaapiDriver) switch (_vaapiDriver)
{ {
case VaapiDriver.i965: case VaapiDriver.i965:
startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "i965"); startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "i965";
break; break;
case VaapiDriver.iHD: case VaapiDriver.iHD:
startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "iHD"); startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "iHD";
break; break;
case VaapiDriver.RadeonSI: case VaapiDriver.RadeonSI:
startInfo.EnvironmentVariables.Add("LIBVA_DRIVER_NAME", "radeonsi"); startInfo.EnvironmentVariables["LIBVA_DRIVER_NAME"] = "radeonsi";
break; break;
} }
} }
@ -659,8 +659,8 @@ namespace ErsatzTV.Core.FFmpeg
// colon after drive letter needs to be escaped // colon after drive letter needs to be escaped
fileName = fileName.Replace(@":/", @"\:/"); fileName = fileName.Replace(@":/", @"\:/");
} }
startInfo.EnvironmentVariables.Add("FFREPORT", $"file={fileName}:level=32"); startInfo.EnvironmentVariables["FFREPORT"] = $"file={fileName}:level=32";
} }
startInfo.ArgumentList.Add("-nostdin"); startInfo.ArgumentList.Add("-nostdin");

Loading…
Cancel
Save