merge r34204, r34205 and r34206. [chd] enable WMV3 decode under bcm70015 cards

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@34209 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
index e7cd7d8..116f10a 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -192,6 +192,7 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec( CDVDStreamInfo &hint )
       {
         case CODEC_ID_VC1:
         case CODEC_ID_H264:
+        case CODEC_ID_WMV3:
         case CODEC_ID_MPEG2VIDEO:
           if (hint.codec == CODEC_ID_H264 && hint.ptsinvalid)
             break;

diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
index c56cd47..1c977b7 100644 (file)
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
@@ -1165,6 +1165,8 @@ bool CCrystalHD::OpenDecoder(CRYSTALHD_CODEC_TYPE codec_type, CDVDStreamInfo &hi
       m_convert_bitstream = false;
     break;
     case CRYSTALHD_CODEC_ID_WMV3:
+      if (!m_has_bcm70015)
+        return false;
       videoAlg = BCM::BC_VID_ALGO_VC1MP;
       StreamType = BCM::BC_STREAM_TYPE_ES;
       m_convert_bitstream = false;