Merge pull request #851 from sum2012/master

Add Ini for use Media Engine

Core/Config.cpp

@@ -72,6 +72,7 @@ void CConfig::Load(const char *iniFileName)
 	graphics->Get("SSAA", &SSAntiAliasing, 0);
 	graphics->Get("VBO", &bUseVBO, false);
 	graphics->Get("FrameSkip", &iFrameSkip, 0);
+	graphics->Get("UseMediaEngine", &bUseMediaEngine, true);
 #ifdef USING_GLES2
 	graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 0);
 #else
@@ -138,6 +139,7 @@ void CConfig::Save()
 		graphics->Set("SSAA", SSAntiAliasing);
 		graphics->Set("VBO", bUseVBO);
 		graphics->Set("FrameSkip", iFrameSkip);
+		graphics->Set("UseMediaEngine", bUseMediaEngine);	
 		graphics->Set("AnisotropyLevel", iAnisotropyLevel);
 		graphics->Set("VertexCache", bVertexCache);
 		graphics->Set("FullScreen", bFullScreen);

Core/Config.h

@@ -60,6 +60,7 @@ public:
 	bool bUseVBO;
 	bool bStretchToDisplay;
 	int iFrameSkip;  // 0 = off;  1 = auto;  (future:  2 = skip every 2nd frame;  3 = skip every 3rd frame etc).
+	bool bUseMediaEngine;
 
 	int iWindowZoom;  // for Windows
 	bool SSAntiAliasing; //for Windows, too

Core/HLE/sceMpeg.cpp

@@ -23,6 +23,7 @@
 #include "sceKernelThread.h"
 #include "HLE.h"
 #include "../HW/MediaEngine.h"
+#include "../../Core/Config.h"
 
 static bool useMediaEngine;
 
@@ -519,6 +520,10 @@ int sceMpegAvcDecodeMode(u32 mpeg, u32 modeAddr)
 
 int sceMpegQueryStreamOffset(u32 mpeg, u32 bufferAddr, u32 offsetAddr)
 {
+	if (g_Config.bUseMediaEngine == false){
+		WARN_LOG(HLE, "Media Engine disabled");
+		return -1;
+	}
 	MpegContext *ctx = getMpegCtx(mpeg);
 	if (!ctx) {
 		WARN_LOG(HLE, "sceMpegQueryStreamOffset(%08x, %08x, %08x): bad mpeg handle", mpeg, bufferAddr, offsetAddr);