[aml] only force s/w for vob files

MINIX-NEO · Jan 3, 2016 · b4ca1d1 · b4ca1d1
1 parent 2da45bd
commit b4ca1d1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -225,15 +225,17 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
   {
     switch(hint.codec)
     {
-//      case AV_CODEC_ID_MPEG4:
-//      case AV_CODEC_ID_MSMPEG4V2:
-//      case AV_CODEC_ID_MSMPEG4V3:
+      /*
+      case AV_CODEC_ID_MPEG4:
+      case AV_CODEC_ID_MSMPEG4V2:
+      case AV_CODEC_ID_MSMPEG4V3:
       case AV_CODEC_ID_MPEG1VIDEO:
       case AV_CODEC_ID_MPEG2VIDEO:
         // Avoid h/w decoder for SD; Those files might use features
         // not supported and can easily be soft-decoded
         if (hint.width <= 800)
           break;
+          */
       default:
         if ( (pCodec = OpenCodec(new CDVDVideoCodecAmlogic(), hint, options)) ) return pCodec;
     }

diff --git a/xbmc/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp
@@ -3437,6 +3437,15 @@ bool CDVDPlayer::OpenVideoStream(CDVDStreamInfo& hint, bool reset)
       }
     }
   }
+  if (m_pInputStream)
+  {
+    std::string filename = m_pInputStream->GetFileName();
+    if (StringUtils::EndsWithNoCase(filename, "vob"))
+    {
+      CLog::Log(LOGDEBUG, "CDVDPlayer::OpenVideoStream -- %s", filename.c_str());
+      hint.software = true;
+    }
+  }
 
   CDVDInputStream::IMenus* pMenus = dynamic_cast<CDVDInputStream::IMenus*>(m_pInputStream);
   if(pMenus && pMenus->IsInMenu())