VideoPlayerVideo: Invert stereo flags from codec when option is enabled

popcornmix · Apr 3, 2020 · 285529e · 285529e
1 parent 04f976f
commit 285529e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp b/xbmc/cores/VideoPlayer/VideoPlayerVideo.cpp
@@ -14,6 +14,7 @@
 #include "ServiceBroker.h"
 #include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h"
 #include "cores/VideoPlayer/Interface/Addon/TimingConstants.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
 #include "settings/AdvancedSettings.h"
 #include "settings/SettingsComponent.h"
 #include "utils/MathUtils.h"
@@ -700,6 +701,8 @@ bool CVideoPlayerVideo::ProcessDecoderOutput(double &frametime, double &pts)
           break;
         default:
           stereoMode = m_hints.stereo_mode;
+          if (m_processInfo.GetVideoSettings().m_StereoInvert)
+            stereoMode = InvertStereoMode(stereoMode);
           break;
       }
       if (!stereoMode.empty())

diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.cpp
@@ -87,3 +87,28 @@ unsigned int GetFlagsStereoMode(const std::string& mode)
   return convert[mode];
 }
 
+std::string InvertStereoMode(const std::string& mode)
+{
+  static std::map<std::string, std::string> convert;
+  if(convert.empty())
+  {
+    convert[""]                       = "";
+    convert["left_right"]             = "right_left";
+    convert["bottom_top"]             = "top_bottom";
+    convert["top_bottom"]             = "bottom_top";
+    convert["checkerboard_rl"]        = "checkerboard_lr";
+    convert["checkerboard_lr"]        = "checkerboard_rl";
+    convert["row_interleaved_rl"]     = "row_interleaved_lr";
+    convert["row_interleaved_lr"]     = "row_interleaved_rl";
+    convert["col_interleaved_rl"]     = "col_interleaved_lr";
+    convert["col_interleaved_lr"]     = "col_interleaved_rl";
+    convert["right_left"]             = "left_right";
+    convert["block_lr"]               = "block_rl";
+    convert["block_rl"]               = "block_lr";
+  }
+  // if the format is not known then leave it as it is
+  if (convert.count(mode) == 0)
+    return mode;
+  return convert[mode];
+}
+
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.h b/xbmc/cores/VideoPlayer/VideoRenderers/RenderFlags.h
@@ -66,3 +66,4 @@ unsigned int GetFlagsColorMatrix(unsigned int color_matrix, unsigned width, unsi
 unsigned int GetFlagsChromaPosition(unsigned int chroma_position);
 unsigned int GetFlagsColorPrimaries(unsigned int color_primaries);
 unsigned int GetFlagsStereoMode(const std::string& mode);
+std::string InvertStereoMode(const std::string& mode);