aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Frühberger <Peter.Fruehberger@gmail.com>2016-08-21 09:15:14 +0200
committerGitHub <noreply@github.com>2016-08-21 09:15:14 +0200
commit81d5d261c37919a14183d22315554cd7773da36b (patch)
tree48d348e2489df494cf0c18cfc610313a7d981a67
parent59efbe31d60c835ba13c87be4ff40477f1fc8a5a (diff)
parent2a1e6e52bd16d91f1c18cf4100b57a7a0e1f2ed5 (diff)
Merge pull request #10317 from kszaq/amlogic_hi10p17.0b1-Krypton
DVDVideoCodecAmlogic: Do not H/W decode Hi10P
-rw-r--r--xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
index 123d722ab7..ae63fb3e61 100644
--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp
@@ -100,6 +100,13 @@ bool CDVDVideoCodecAmlogic::Open(CDVDStreamInfo &hints, CDVDCodecOptions &option
case AV_CODEC_ID_H264:
if (m_hints.width <= CSettings::GetInstance().GetInt(CSettings::SETTING_VIDEOPLAYER_USEAMCODECH264))
return false;
+ switch(hints.profile)
+ {
+ case FF_PROFILE_H264_HIGH_10:
+ case FF_PROFILE_H264_HIGH_10_INTRA:
+ // Amlogic decodes Hi10P with lots of artifacts
+ return false;
+ }
if ((!aml_support_h264_4k2k()) && ((m_hints.width > 1920) || (m_hints.height > 1088)))
{
// 4K is supported only on Amlogic S802/S812 chip