Merge pull request xbmc#8383 from koying/fixdroidmpeg2

FIX: [droid] Only sw for SD MPEG
afedchin · Nov 14, 2015 · a08cbdb · a08cbdb
2 parents 62bba67 + 344af8f
commit a08cbdb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
@@ -216,6 +216,8 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
       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)
@@ -270,6 +272,8 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
       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)
@@ -286,6 +290,8 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
       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)
@@ -328,6 +334,8 @@ CDVDVideoCodec* CDVDFactoryCodec::CreateVideoCodec(CDVDStreamInfo &hint, const C
         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)