From 9a23b7f0fc569b299b488c31477caa1e2087ba83 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Thu, 13 Apr 2023 20:30:32 -0500
Subject: [PATCH] New: Improve video stream formatting

(cherry picked from commit 39350ed0de4aca769ef7661f1dce08f9f462e7c3)
---
 .../FormatVideoCodecFixture.cs                   |  1 +
 .../MediaFiles/MediaInfo/MediaInfoFormatter.cs   | 16 +++++++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs
index 382e77ecc..b05bd5e1a 100644
--- a/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs
+++ b/src/NzbDrone.Core.Test/MediaFiles/MediaInfo/MediaInfoFormatterTests/FormatVideoCodecFixture.cs
@@ -25,6 +25,7 @@ namespace NzbDrone.Core.Test.MediaFiles.MediaInfo.MediaInfoFormatterTests
         [TestCase("msmpeg4, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
         [TestCase("msmpeg4v2, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
         [TestCase("msmpeg4v3, DIV3", "Movie the Title (1976) 360p MPEG Audio.avi", "DivX")]
+        [TestCase("vp6f, 4", "Movie the Title (1976) 360p MPEG Audio.flv", "VP6")]
         [TestCase("vp6, 4", "Top Gear - S12E01 - Lorries - SD TV.flv", "VP6")]
         [TestCase("vp7, VP70", "Movie the Title.avi", "VP7")]
         [TestCase("vp8, V_VP8", "Movie the Title.mkv", "VP8")]
diff --git a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
index 47c4c1326..f78a253eb 100644
--- a/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
+++ b/src/NzbDrone.Core/MediaFiles/MediaInfo/MediaInfoFormatter.cs
@@ -154,7 +154,7 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
             }
 
             Logger.ForDebugEvent()
-                  .Message("Unknown audio format: '{0}' in '{1}'.", mediaInfo.RawStreamData, sceneName)
+                  .Message("Unknown audio format: '{0}' in '{1}'. Streams: {2}", audioFormat, sceneName, mediaInfo.RawStreamData)
                   .WriteSentryWarn("UnknownAudioFormatFFProbe", mediaInfo.ContainerFormat, mediaInfo.AudioFormat, audioCodecID)
                   .Log();
 
@@ -236,8 +236,12 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                 return "AV1";
             }
 
-            if (videoFormat == "vp6" ||
-                videoFormat == "vp7" ||
+            if (videoFormat.Contains("vp6"))
+            {
+                return "VP6";
+            }
+
+            if (videoFormat == "vp7" ||
                 videoFormat == "vp8" ||
                 videoFormat == "vp9")
             {
@@ -257,13 +261,15 @@ namespace NzbDrone.Core.MediaFiles.MediaInfo
                 videoFormat == "rv20" ||
                 videoFormat == "rv30" ||
                 videoFormat == "rv40" ||
-                videoFormat == "cinepak")
+                videoFormat == "cinepak" ||
+                videoFormat == "rawvideo" ||
+                videoFormat == "msvideo1")
             {
                 return "";
             }
 
             Logger.ForDebugEvent()
-                  .Message("Unknown video format: '{0}' in '{1}'.", mediaInfo.RawStreamData, sceneName)
+                  .Message("Unknown video format: '{0}' in '{1}'. Streams: {2}", videoFormat, sceneName, mediaInfo.RawStreamData)
                   .WriteSentryWarn("UnknownVideoFormatFFProbe", mediaInfo.ContainerFormat, videoFormat, videoCodecID)
                   .Log();