Backport [27370],[27375],[27377]. Fixes #6569 temporarily

git-svn-id: http://svn.mythtv.org/svn/branches/release-0-24-fixes@27395 7dbf422c-18fa-0310-86e9-fd20926502f2
MythTV · Dec 1, 2010 · 4d4abe5 · 4d4abe5
1 parent 8e616b4
commit 4d4abe5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/mythtv/libs/libmyth/audiooutpututil.cpp b/mythtv/libs/libmyth/audiooutpututil.cpp
@@ -450,6 +450,19 @@ static int fromFloatFLT(float *out, float *in, int len)
     return len << 2;
 }
 
+/**
+ * Returns true if platform has an FPU.
+ * for the time being, this test is limited to testing if SSE2 is supported
+ */
+bool AudioOutputUtil::has_hardware_fpu()
+{
+#if ARCH_X86
+    return sse_check();
+#else
+    return false;
+#endif
+}
+
 /**
  * Convert integer samples to floats
  *

diff --git a/mythtv/libs/libmyth/audiooutpututil.h b/mythtv/libs/libmyth/audiooutpututil.h
@@ -5,9 +5,10 @@ using namespace std;
 #include "mythverbose.h"
 #include "audiooutputsettings.h"
 
-class AudioOutputUtil
+class MPUBLIC AudioOutputUtil
 {
  public:
+    static bool has_hardware_fpu();
     static int  toFloat(AudioFormat format, void *out, void *in, int bytes);
     static int  fromFloat(AudioFormat format, void *out, void *in, int bytes);
     static void MonoToStereo(void *dst, void *src, int samples);

diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -15,6 +15,7 @@ using namespace std;
 #include "avformatdecoder.h"
 #include "privatedecoder.h"
 #include "audiooutput.h"
+#include "audiooutpututil.h"
 #include "RingBuffer.h"
 #include "mythplayer.h"
 #include "remoteencoder.h"
@@ -4584,6 +4585,10 @@ void AvFormatDecoder::SetDisablePassThrough(bool disable)
 
 inline bool AvFormatDecoder::DecoderWillDownmix(const AVCodecContext *ctx)
 {
+        // Until ffmpeg properly implements dialnorm
+        // use Myth internal downmixer if machines has FPU/SSE
+    if (AudioOutputUtil::has_hardware_fpu())
+        return false;
     switch (ctx->codec_id)
     {
         case CODEC_ID_AC3: