Merge pull request #973 from anssih/fix/AE-byteswap

[AE] Fix issues related to endianness in passthrough

Conflicts:
	xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp

diff --cc xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
index 647b5a9,d87c7db..8c7eaa2
--- 1/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
--- 2/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
+++ b/xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp
@@@ -1010,16 -1006,26 +1016,35 @@@ void CSoftAE::RunRawOutputStage(
    if(m_buffer.Used() < m_sinkBlockSize)
      return;
  
-   int wroteFrames = m_sink->AddPackets((uint8_t*)m_buffer.Raw(m_sinkBlockSize), m_sinkFormat.m_frames);
+   void *data = m_buffer.Raw(m_sinkBlockSize);
+ 
+   if (CAEUtil::S16NeedsByteSwap(AE_FMT_S16NE, m_sinkFormat.m_dataFormat))
+   {
+     /*
+      * It would really be preferable to handle this at packing stage, so that
+      * it could byteswap the data efficiently without wasting CPU time on
+      * swapping the huge IEC 61937 zero padding between frames (or not
+      * byteswap at all, if there are two byteswaps).
+      *
+      * Unfortunately packing is done on a higher level and we can't easily
+      * tell it the needed format from here, so do it here for now (better than
+      * nothing)...
+      */
+     AllocateConvIfNeeded(m_sinkBlockSize);
+     Endian_Swap16_buf((uint16_t *)m_converted, (uint16_t *)data, m_sinkBlockSize / 2);
+     data = m_converted;
+   }
+ 
+   int wroteFrames = m_sink->AddPackets((uint8_t *)data, m_sinkFormat.m_frames);
 +
 +  /* Return value of INT_MAX signals error in sink - restart */
 +  if (wroteFrames == INT_MAX)
 +  {
 +    CLog::Log(LOGERROR, "CSoftAE::RunRawOutputStage - sink error - reinit flagged");
 +    wroteFrames = 0;
 +    m_reOpen = true;
 +  }
 +
    m_buffer.Shift(NULL, wroteFrames * m_sinkFormat.m_frameSize);
  }
  

diff --cc xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp
Simple merge

diff --cc xbmc/cores/AudioEngine/Utils/AEUtil.h
Simple merge

diff --cc xbmc/utils/EndianSwap.h
Simple merge

diff --cc xbmc/utils/Makefile
index f086b48,1f7b31a..b94dfc4
--- 1/xbmc/utils/Makefile
--- 2/xbmc/utils/Makefile
+++ b/xbmc/utils/Makefile
@@@ -9,9 -9,9 +9,10 @@@ SRCS=AlarmClock.cpp 
       CPUInfo.cpp \
       Crc32.cpp \
       CryptThreading.cpp \
 +     DatabaseUtils.cpp \
       DownloadQueue.cpp \
       DownloadQueueManager.cpp \
+      EndianSwap.cpp \
       Fanart.cpp \
       fastmemcpy.c \
       fastmemcpy-arm.S \