diff options
| author | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-15 11:56:43 -0600 |
|---|---|---|
| committer | Trent Nelson <trent.a.b.nelson@gmail.com> | 2014-04-15 12:16:35 -0600 |
| commit | 5bd16771e54042f4c6d5d8d38fd3e8cba66ed6be (patch) | |
| tree | f85e5cc6e71354438ba3faf5ac2707175ceaacf0 | |
| parent | 3eb113857c64e5bb4d2f60c32e722427414d8949 (diff) | |
Merge pull request #4559 from koying/fixdroidpassthrough
FIX: [droid] allow all boxes to enable passthrough (frodo way)
| -rw-r--r-- | xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp index 7750dbafae..db8e6e186c 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp @@ -230,16 +230,7 @@ void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) m_info.m_dataFormats.clear(); m_info.m_sampleRates.clear(); - m_info.m_deviceType = AE_DEVTYPE_PCM; -#if defined(HAS_LIBAMCODEC) - // AML devices can do passthough - if (aml_present()) - { - m_info.m_deviceType = AE_DEVTYPE_HDMI; - m_info.m_dataFormats.push_back(AE_FMT_AC3); - m_info.m_dataFormats.push_back(AE_FMT_DTS); - } -#endif + m_info.m_deviceType = AE_DEVTYPE_HDMI; m_info.m_deviceName = "AudioTrack"; m_info.m_displayName = "android"; m_info.m_displayNameExtra = "audiotrack"; @@ -247,6 +238,8 @@ void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) m_info.m_channels += AE_CH_FR; m_info.m_sampleRates.push_back(CJNIAudioTrack::getNativeOutputSampleRate(CJNIAudioManager::STREAM_MUSIC)); m_info.m_dataFormats.push_back(AE_FMT_S16LE); + m_info.m_dataFormats.push_back(AE_FMT_AC3); + m_info.m_dataFormats.push_back(AE_FMT_DTS); #if 0 //defined(__ARM_NEON__) if (g_cpuInfo.GetCPUFeatures() & CPU_FEATURE_NEON) m_info.m_dataFormats.push_back(AE_FMT_FLOAT); |