AESinkAudioTrack: Support Mono layout

v2: use get_static_field
xbmc · Oct 30, 2016 · e75604c · e75604c
1 parent fa27065
commit e75604c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp
@@ -162,8 +162,10 @@ static int AEChannelMapToAUDIOTRACKChannelMask(CAEChannelInfo info)
          | CJNIAudioFormat::CHANNEL_OUT_SIDE_RIGHT;
   else if (info.Count() > 2)
     return CJNIAudioFormat::CHANNEL_OUT_5POINT1;
-  else
+  else if (info.Count() == 2)
     return CJNIAudioFormat::CHANNEL_OUT_STEREO;
+  else
+    return CJNIAudioFormat::CHANNEL_OUT_MONO;
 #endif
 
   info.ResolveChannels(KnownChannels);
@@ -323,6 +325,7 @@ bool CAESinkAUDIOTRACK::Initialize(AEAudioFormat &format, std::string &device)
 
   while (!m_at_jni)
   {
+    CLog::Log(LOGNOTICE, "Trying to open: %u samplerate %d channelMask %d encoding", m_sink_sampleRate, atChannelMask, m_encoding);
     int min_buffer = CJNIAudioTrack::getMinBufferSize(m_sink_sampleRate,
                                                          atChannelMask,
                                                          m_encoding);

diff --git a/xbmc/platform/android/jni/AudioFormat.cpp b/xbmc/platform/android/jni/AudioFormat.cpp
@@ -34,6 +34,7 @@ int CJNIAudioFormat::ENCODING_DTS_HD                   = 0x00000008;
 int CJNIAudioFormat::ENCODING_DOLBY_TRUEHD             = 0x00000009;
 int CJNIAudioFormat::ENCODING_IEC61937                 = 0x0000000d;
 
+int CJNIAudioFormat::CHANNEL_OUT_MONO                  = 0x00000004;
 int CJNIAudioFormat::CHANNEL_OUT_STEREO                = 0x0000000c;
 int CJNIAudioFormat::CHANNEL_OUT_5POINT1               = 0x000000fc;
 
@@ -76,6 +77,7 @@ void CJNIAudioFormat::PopulateStaticFields()
     if (sdk >= 5)
     {
       CJNIAudioFormat::CHANNEL_OUT_STEREO = get_static_field<int>(c, "CHANNEL_OUT_STEREO");
+      CJNIAudioFormat::CHANNEL_OUT_MONO = get_static_field<int>(c, "CHANNEL_OUT_MONO");
       CJNIAudioFormat::CHANNEL_OUT_5POINT1 = get_static_field<int>(c, "CHANNEL_OUT_5POINT1");
       CJNIAudioFormat::CHANNEL_OUT_FRONT_LEFT = get_static_field<int>(c, "CHANNEL_OUT_FRONT_LEFT");
       CJNIAudioFormat::CHANNEL_OUT_FRONT_LEFT_OF_CENTER = get_static_field<int>(c, "CHANNEL_OUT_FRONT_LEFT_OF_CENTER");

diff --git a/xbmc/platform/android/jni/AudioFormat.h b/xbmc/platform/android/jni/AudioFormat.h
@@ -40,6 +40,7 @@ class CJNIAudioFormat : public CJNIBase
   static int ENCODING_DOLBY_TRUEHD;
   static int ENCODING_IEC61937;
 
+  static int CHANNEL_OUT_MONO;
   static int CHANNEL_OUT_STEREO;
   static int CHANNEL_OUT_5POINT1;