Fix for channel count when using request_channel_layout with TrueHD

Author: popcornmix

OMXAudio.cpp

@@ -386,7 +386,15 @@ bool COMXAudio::PortSettingsChanged()
   return true;
 }
 
-bool COMXAudio::Initialize(const CStdString& device, int iChannels, uint64_t channelMap,
+static unsigned count_bits(uint64_t value)
+{
+  unsigned bits = 0;
+  for(;value;++bits)
+    value &= value - 1;
+  return bits;
+}
+
+bool COMXAudio::Initialize(const CStdString& device, uint64_t channelMap,
                            COMXStreamInfo &hints, enum PCMLayout layout, unsigned int uiSampleRate, unsigned int uiBitsPerSample, bool boostOnDownmix,
                            OMXClock *clock, bool bUsePassthrough, bool bUseHWDecode, bool is_live, float fifo_size)
 {
@@ -401,7 +409,7 @@ bool COMXAudio::Initialize(const CStdString& device, int iChannels, uint64_t cha
   m_deviceuse   = device;
   m_HWDecode    = bUseHWDecode;
   m_Passthrough = bUsePassthrough;
-  m_InputChannels = iChannels;
+  m_InputChannels = count_bits(channelMap);
   m_fifo_size = fifo_size;
   m_normalize_downmix = !boostOnDownmix;
   m_live = is_live;
@@ -463,7 +471,7 @@ bool COMXAudio::Initialize(const CStdString& device, int iChannels, uint64_t cha
     m_OutputChannels = BuildChannelMapCEA(outLayout, GetChannelLayout(layout));
     CPCMRemap m_remap;
     m_remap.Reset();
-    /*outLayout = */m_remap.SetInputFormat (iChannels, inLayout, uiBitsPerSample / 8, uiSampleRate, layout, boostOnDownmix);
+    /*outLayout = */m_remap.SetInputFormat (m_InputChannels, inLayout, uiBitsPerSample / 8, uiSampleRate, layout, boostOnDownmix);
     m_remap.SetOutputFormat(m_OutputChannels, outLayout);
     m_remap.GetDownmixMatrix(m_downmix_matrix);
     m_wave_header.dwChannelMask = channelMap;

OMXAudio.h

@@ -59,7 +59,7 @@ class COMXAudio
   unsigned int GetAudioRenderingLatency();
   float GetMaxLevel(double &pts);
   COMXAudio();
-  bool Initialize(const CStdString& device, int iChannels, uint64_t channelMap,
+  bool Initialize(const CStdString& device, uint64_t channelMap,
                            COMXStreamInfo &hints, enum PCMLayout layout, unsigned int uiSamplesPerSec, unsigned int uiBitsPerSample, bool boostOnDownmix,
                            OMXClock *clock, bool bUsePassthrough = false, bool bUseHWDecode = false, bool is_live = false, float fifo_size = 0);
   ~COMXAudio();

OMXAudioCodecOMX.cpp

@@ -59,7 +59,7 @@ COMXAudioCodecOMX::~COMXAudioCodecOMX()
   Dispose();
 }
 
-bool COMXAudioCodecOMX::Open(COMXStreamInfo &hints)
+bool COMXAudioCodecOMX::Open(COMXStreamInfo &hints, enum PCMLayout layout)
 {
   AVCodec* pCodec;
   m_bOpenedCodec = false;
@@ -91,21 +91,27 @@ bool COMXAudioCodecOMX::Open(COMXStreamInfo &hints)
   m_pCodecContext->block_align = hints.blockalign;
   m_pCodecContext->bit_rate = hints.bitrate;
   m_pCodecContext->bits_per_coded_sample = hints.bitspersample;
-
-  // vorbis has variable sized planar output, so skip concatenation
-  if (hints.codec == AV_CODEC_ID_VORBIS)
-    m_bNoConcatenate = true;
-
-  enum PCMLayout layout = PCM_LAYOUT_2_0;// todo: fill in
   if (hints.codec == AV_CODEC_ID_TRUEHD)
   {
     if (layout == PCM_LAYOUT_2_0)
+    {
       m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_STEREO;
+      m_pCodecContext->channels = 2;
+      m_pCodecContext->channel_layout = m_dllAvUtil.av_get_default_channel_layout(m_pCodecContext->channels);
+    }
     else if (layout <= PCM_LAYOUT_5_1)
+    {
       m_pCodecContext->request_channel_layout = AV_CH_LAYOUT_5POINT1;
+      m_pCodecContext->channels = 6;
+      m_pCodecContext->channel_layout = m_dllAvUtil.av_get_default_channel_layout(m_pCodecContext->channels);
+    }
   }
   if (m_pCodecContext->request_channel_layout)
-    CLog::Log(LOGNOTICE,"COMXAudioCodecOMX::Open() Requesting channel layout of %d", (unsigned)m_pCodecContext->request_channel_layout);
+    CLog::Log(LOGNOTICE,"COMXAudioCodecOMX::Open() Requesting channel layout of %x", (unsigned)m_pCodecContext->request_channel_layout);
+
+  // vorbis has variable sized planar output, so skip concatenation
+  if (hints.codec == AV_CODEC_ID_VORBIS)
+    m_bNoConcatenate = true;
 
   if(m_pCodecContext->bits_per_coded_sample == 0)
     m_pCodecContext->bits_per_coded_sample = 16;

OMXAudioCodecOMX.h

@@ -35,7 +35,7 @@ class COMXAudioCodecOMX
 public:
   COMXAudioCodecOMX();
   ~COMXAudioCodecOMX();
-  bool Open(COMXStreamInfo &hints);
+  bool Open(COMXStreamInfo &hints, enum PCMLayout layout);
   void Dispose();
   int Decode(BYTE* pData, int iSize, double dts, double pts);
   int GetData(BYTE** dst, double &dts, double &pts);

OMXPlayerAudio.cpp

@@ -389,7 +389,7 @@ bool OMXPlayerAudio::OpenAudioCodec()
 {
   m_pAudioCodec = new COMXAudioCodecOMX();
 
-  if(!m_pAudioCodec->Open(m_hints))
+  if(!m_pAudioCodec->Open(m_hints, m_layout))
   {
     delete m_pAudioCodec; m_pAudioCodec = NULL;
     return false;
@@ -443,7 +443,7 @@ bool OMXPlayerAudio::OpenDecoder()
   if(m_passthrough)
     m_hw_decode = false;
 
-  bAudioRenderOpen = m_decoder->Initialize(m_device, m_hints.channels, m_pAudioCodec->GetChannelMap(),
+  bAudioRenderOpen = m_decoder->Initialize(m_device, m_pAudioCodec->GetChannelMap(),
                            m_hints, m_layout, m_hints.samplerate, m_pAudioCodec->GetBitsPerSample(), m_boost_on_downmix,
                            m_av_clock, m_passthrough, m_hw_decode, m_live, m_fifo_size);