From 0d4b0bfd9396846971f112c948f8334fb89f9dc4 Mon Sep 17 00:00:00 2001
From: Nikolay Kasyanov <corrmage@gmail.com>
Date: Thu, 7 Feb 2013 23:40:20 +0400
Subject: [PATCH 1/2] Trying to resolve sound issues on OS X with ffmpeg
 backend

---
 apps/openmw/CMakeLists.txt             | 6 ++++++
 apps/openmw/mwsound/ffmpeg_decoder.cpp | 1 +
 2 files changed, 7 insertions(+)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index e2cb0e5c4..b685c6083 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -125,6 +125,12 @@ if(APPLE)
     find_library(COCOA_FRAMEWORK Cocoa)
     find_library(IOKIT_FRAMEWORK IOKit)
     target_link_libraries(openmw ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
+
+    if (FFMPEG_FOUND)
+        find_library(COREVIDEO_FRAMEWORK CoreVideo)
+        find_library(VDA_FRAMEWORK VideoDecodeAcceleration)
+        target_link_libraries(openmw ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK})
+    endif()
 endif(APPLE)
 
 if(DPKG_PROGRAM)
diff --git a/apps/openmw/mwsound/ffmpeg_decoder.cpp b/apps/openmw/mwsound/ffmpeg_decoder.cpp
index 261a86ca6..00530a962 100644
--- a/apps/openmw/mwsound/ffmpeg_decoder.cpp
+++ b/apps/openmw/mwsound/ffmpeg_decoder.cpp
@@ -160,6 +160,7 @@ void FFmpeg_Decoder::open(const std::string &fname)
         {
             if(mFormatCtx->streams[j]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
             {
+                mFormatCtx->streams[j]->codec->request_sample_fmt = AV_SAMPLE_FMT_S16;
                 mStream = &mFormatCtx->streams[j];
                 break;
             }

From 62c711d709d9c3bf314b97bd31b198f3768255e9 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 11 Feb 2013 02:28:02 +0100
Subject: [PATCH 2/2] Small change to delete microcode cache more aggressively.

---
 extern/shiny/Main/Factory.cpp | 18 +++++++++++-------
 extern/shiny/Main/Factory.hpp |  5 ++++-
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/extern/shiny/Main/Factory.cpp b/extern/shiny/Main/Factory.cpp
index 21f13e30b..40c695fd4 100644
--- a/extern/shiny/Main/Factory.cpp
+++ b/extern/shiny/Main/Factory.cpp
@@ -15,6 +15,7 @@
 namespace sh
 {
 	Factory* Factory::sThis = 0;
+	const std::string Factory::mBinaryCacheName = "binaryCache";
 
 	Factory& Factory::getInstance()
 	{
@@ -198,16 +199,16 @@ namespace sh
 					if (mShadersLastModified[sourceRelative] != lastModified)
 					{
 						// delete any outdated shaders based on this shader set
-						removeCache (it->first);
-						// remove the whole binary cache (removing only the individual shaders does not seem to be possible at this point with OGRE)
-						removeBinaryCache = true;
+						if (removeCache (it->first))
+							removeBinaryCache = true;
 					}
 				}
 				else
 				{
 					// if we get here, this is either the first run or a new shader file was added
 					// in both cases we can safely delete
-					removeCache (it->first);
+					if (removeCache (it->first))
+						removeBinaryCache = true;
 				}
 				mShaderSets.insert(std::make_pair(it->first, newSet));
 			}
@@ -304,7 +305,7 @@ namespace sh
 
 		if (mPlatform->supportsShaderSerialization () && mReadMicrocodeCache && !removeBinaryCache)
 		{
-			std::string file = mPlatform->getCacheFolder () + "/shShaderCache.txt";
+			std::string file = mPlatform->getCacheFolder () + "/" + mBinaryCacheName;
 			if (boost::filesystem::exists(file))
 			{
 				mPlatform->deserializeShaders (file);
@@ -316,7 +317,7 @@ namespace sh
 	{
 		if (mPlatform->supportsShaderSerialization () && mWriteMicrocodeCache)
 		{
-			std::string file = mPlatform->getCacheFolder () + "/shShaderCache.txt";
+			std::string file = mPlatform->getCacheFolder () + "/" + mBinaryCacheName;
 			mPlatform->serializeShaders (file);
 		}
 
@@ -590,8 +591,9 @@ namespace sh
 		m->createForConfiguration (configuration, 0);
 	}
 
-	void Factory::removeCache(const std::string& pattern)
+	bool Factory::removeCache(const std::string& pattern)
 	{
+		bool ret = false;
 		if ( boost::filesystem::exists(mPlatform->getCacheFolder())
 			 && boost::filesystem::is_directory(mPlatform->getCacheFolder()))
 		{
@@ -620,10 +622,12 @@ namespace sh
 					if (shaderName == pattern)
 					{
 						boost::filesystem::remove(file);
+						ret = true;
 						std::cout << "Removing outdated shader: " << file << std::endl;
 					}
 				}
 			}
 		}
+		return ret;
 	}
 }
diff --git a/extern/shiny/Main/Factory.hpp b/extern/shiny/Main/Factory.hpp
index 6d4175c97..846860b89 100644
--- a/extern/shiny/Main/Factory.hpp
+++ b/extern/shiny/Main/Factory.hpp
@@ -203,7 +203,10 @@ namespace sh
 		MaterialInstance* findInstance (const std::string& name);
 		MaterialInstance* searchInstance (const std::string& name);
 
-		void removeCache (const std::string& pattern);
+		/// @return was anything removed?
+		bool removeCache (const std::string& pattern);
+
+		static const std::string mBinaryCacheName;
 	};
 }