diff options
| author | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 01:45:26 -0400 |
|---|---|---|
| committer | LukePulverenti Luke Pulverenti luke pulverenti <LukePulverenti Luke Pulverenti luke.pulverenti@gmail.com> | 2012-08-23 01:45:26 -0400 |
| commit | c80c8c1cfd594f2597e46b09d44360ade9f4fec2 (patch) | |
| tree | 6e4ad0b3f3fff80512e9693695aa80725fdbb7ce /MediaBrowser.Controller/FFMpeg/FFProbe.cs | |
| parent | 882e364326006f19f272b6084ae0e3863945ee5a (diff) | |
Switched all i/o to win32 methods and added protobuf serialization for ffprobe caching
Diffstat (limited to 'MediaBrowser.Controller/FFMpeg/FFProbe.cs')
| -rw-r--r-- | MediaBrowser.Controller/FFMpeg/FFProbe.cs | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/MediaBrowser.Controller/FFMpeg/FFProbe.cs b/MediaBrowser.Controller/FFMpeg/FFProbe.cs index eb0d77a99..83f70af3a 100644 --- a/MediaBrowser.Controller/FFMpeg/FFProbe.cs +++ b/MediaBrowser.Controller/FFMpeg/FFProbe.cs @@ -23,6 +23,10 @@ namespace MediaBrowser.Controller.FFMpeg catch (FileNotFoundException)
{
}
+ catch (Exception ex)
+ {
+ Logger.LogException(ex);
+ }
FFProbeResult result = Run(item.Path);
@@ -34,15 +38,22 @@ namespace MediaBrowser.Controller.FFMpeg private static FFProbeResult GetCachedResult(string path)
{
- return JsvSerializer.DeserializeFromFile<FFProbeResult>(path);
+ return ProtobufSerializer.DeserializeFromFile<FFProbeResult>(path);
}
- private static void CacheResult(FFProbeResult result, string outputCachePath)
+ private static async void CacheResult(FFProbeResult result, string outputCachePath)
{
- Task.Run(() =>
+ await Task.Run(() =>
{
- JsvSerializer.SerializeToFile<FFProbeResult>(result, outputCachePath);
- });
+ try
+ {
+ ProtobufSerializer.SerializeToFile<FFProbeResult>(result, outputCachePath);
+ }
+ catch (Exception ex)
+ {
+ Logger.LogException(ex);
+ }
+ }).ConfigureAwait(false);
}
public static FFProbeResult Run(Video item)
@@ -55,6 +66,10 @@ namespace MediaBrowser.Controller.FFMpeg catch (FileNotFoundException)
{
}
+ catch (Exception ex)
+ {
+ Logger.LogException(ex);
+ }
FFProbeResult result = Run(item.Path);
@@ -93,16 +108,7 @@ namespace MediaBrowser.Controller.FFMpeg // If we ever decide to disable the ffmpeg log then you must uncomment the below line.
process.BeginErrorReadLine();
- FFProbeResult result = JsonSerializer.DeserializeFromStream<FFProbeResult>(process.StandardOutput.BaseStream);
-
- process.WaitForExit();
-
- if (process.ExitCode != 0)
- {
- Logger.LogInfo("FFProbe exited with code {0} for {1}", process.ExitCode, input);
- }
-
- return result;
+ return JsonSerializer.DeserializeFromStream<FFProbeResult>(process.StandardOutput.BaseStream);
}
catch (Exception ex)
{
@@ -129,14 +135,14 @@ namespace MediaBrowser.Controller.FFMpeg {
string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeAudioCacheDirectory, item.Id.ToString().Substring(0, 1));
- return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".jsv");
+ return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".pb");
}
private static string GetFFProbeVideoCachePath(BaseEntity item)
{
string outputDirectory = Path.Combine(Kernel.Instance.ApplicationPaths.FFProbeVideoCacheDirectory, item.Id.ToString().Substring(0, 1));
- return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".jsv");
+ return Path.Combine(outputDirectory, item.Id + "-" + item.DateModified.Ticks + ".pb");
}
}
}
|