diff options
| author | Martijn Kaijser <martijn@xbmc.org> | 2015-07-05 08:55:37 +0200 |
|---|---|---|
| committer | Martijn Kaijser <martijn@xbmc.org> | 2015-07-05 08:55:37 +0200 |
| commit | ee9faf011773b67cded1bace6ddac7b8c71056f2 (patch) | |
| tree | 8d99a15f3cbf50f19cbe7e6b4b440dc54666a9a2 | |
| parent | 94abff759d442a1c71174fa8e90085ce214d1963 (diff) | |
| parent | 2160e6f8d5894aa586a902694bc87f684b45fa3f (diff) | |
Merge pull request #7405 from koying/fixdroidexcludehi10p
FIX: [droid] no known working h264/hi10p h/w decoder. Exclude...
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp | 7 | ||||
| -rw-r--r-- | xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp index 86512b54e3..cd83eb9988 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp @@ -350,6 +350,13 @@ bool CDVDVideoCodecAndroidMediaCodec::Open(CDVDStreamInfo &hints, CDVDCodecOptio case AV_CODEC_ID_AVS: case AV_CODEC_ID_CAVS: case AV_CODEC_ID_H264: + switch(hints.profile) + { + case FF_PROFILE_H264_HIGH_10: + case FF_PROFILE_H264_HIGH_10_INTRA: + // No known h/w decoder supporting Hi10P + return false; + } m_mime = "video/avc"; m_formatname = "amc-h264"; // check for h264-avcC and convert to h264-annex-b diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp index 4bd4609a3b..5c329db0ed 100644 --- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp +++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp @@ -73,7 +73,14 @@ bool CDVDVideoCodecStageFright::Open(CDVDStreamInfo &hints, CDVDCodecOptions &op switch (hints.codec) { - case CODEC_ID_H264: + case AV_CODEC_ID_H264: + switch(hints.profile) + { + case FF_PROFILE_H264_HIGH_10: + case FF_PROFILE_H264_HIGH_10_INTRA: + // No known h/w decoder supporting Hi10P + return false; + } m_pFormatName = "stf-h264"; if (hints.extrasize < 7 || hints.extradata == NULL) { |