Permalink
Browse files

[AML] compile fix

  • Loading branch information...
StormTrooper committed Jan 29, 2018
1 parent 864398e commit b3b55a4051069518b6e451647080d07d848ef94c
Showing with 60 additions and 0 deletions.
  1. +60 −0 package/mediacenter-next-osmc/patches/all-200-render-compile-fix.patch
@@ -0,0 +1,60 @@
From dab5bd65b6d961f702bc4d3bdf407b9679f40992 Mon Sep 17 00:00:00 2001
From: peak3d <pfau@peak3d.de>
Date: Sun, 28 Jan 2018 22:59:12 +0100
Subject: [PATCH] [AML] compile fix
---
xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp | 4 ++--
xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp | 1 -
xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
index d5100a643630..4d87106452d8 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/AMLCodec.cpp
@@ -2257,8 +2257,8 @@ std::string CAMLCodec::GetStereoMode()
default: stereo_mode = m_hints.stereo_mode; break;
}
- if(m_processInfo.GetVideoSettings().m_StereoInvert)
- stereo_mode = RenderManager::GetStereoModeInvert(stereo_mode);
+ if (m_processInfo.GetVideoSettings().m_StereoInvert)
+ ;//stereo_mode = RenderManager::GetStereoModeInvert(stereo_mode);
return stereo_mode;
}
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
index f84c6573d2e2..785a7313072c 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
@@ -286,7 +286,6 @@ bool CDVDVideoCodecAmlogic::Open(CDVDStreamInfo &hints, CDVDCodecOptions &option
m_videobuffer.dts = DVD_NOPTS_VALUE;
m_videobuffer.pts = DVD_NOPTS_VALUE;
m_videobuffer.color_range = 0;
- m_videobuffer.color_matrix = 4;
m_videobuffer.iFlags = 0;
m_videobuffer.iWidth = m_hints.width;
m_videobuffer.iHeight = m_hints.height;
diff --git a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp
index cbfb32fd092f..5d0a921835a3 100644
--- a/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp
+++ b/xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp
@@ -27,7 +27,8 @@
#include "utils/ScreenshotAML.h"
#include "settings/MediaSettings.h"
#include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
-#include "../RenderFactory.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
+#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
#include "settings/AdvancedSettings.h"
CRendererAML::CRendererAML()
@@ -62,7 +63,6 @@ bool CRendererAML::Configure(const VideoPicture &picture, float fps, unsigned in
m_renderOrientation = orientation;
m_iFlags = GetFlagsChromaPosition(picture.chroma_position) |
- GetFlagsColorMatrix(picture.color_matrix, picture.iWidth, picture.iHeight) |
GetFlagsColorPrimaries(picture.color_primaries) |
GetFlagsStereoMode(picture.stereoMode);

0 comments on commit b3b55a4

Please sign in to comment.