diff options
| author | S. Davilla <davilla@4pi.com> | 2013-07-14 09:26:49 -0400 |
|---|---|---|
| committer | S. Davilla <davilla@4pi.com> | 2013-07-14 09:26:49 -0400 |
| commit | e56539477257718839e9644968ed78801248b573 (patch) | |
| tree | c1e994d9defcb92d6fbf88266a5496ac4bcee665 | |
| parent | 37b8fb75af29c071a47d1557fe7dfff0b0812dc4 (diff) | |
changed, include AE_FMT_S16NE as avaliable format on audiotrack sink
| -rw-r--r-- | xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp | 19 | ||||
| -rw-r--r-- | xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp index c37bf2d113..045e156b24 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp @@ -73,7 +73,7 @@ CAESinkAUDIOTRACK::CAESinkAUDIOTRACK() : CThread("AudioTrack") { m_sinkbuffer = NULL; - m_alignedS16LE = NULL; + m_alignedS16 = NULL; m_volume_changed = false; m_min_frames = 0; m_sink_frameSize = 0; @@ -166,8 +166,8 @@ void CAESinkAUDIOTRACK::Deinitialize() m_wake.Set(); StopThread(); delete m_sinkbuffer, m_sinkbuffer = NULL; - if (m_alignedS16LE) - _aligned_free(m_alignedS16LE), m_alignedS16LE = NULL; + if (m_alignedS16) + _aligned_free(m_alignedS16), m_alignedS16 = NULL; } bool CAESinkAUDIOTRACK::IsCompatible(const AEAudioFormat format, const std::string &device) @@ -216,7 +216,7 @@ unsigned int CAESinkAUDIOTRACK::AddPackets(uint8_t *data, unsigned int frames, b { // write as many frames of audio as we can fit into our internal buffer. - // our internal sink buffer is always AE_FMT_S16LE + // our internal sink buffer is always AE_FMT_S16 unsigned int write_frames = m_sinkbuffer->GetWriteSize() / m_sink_frameSize; if (write_frames > frames) write_frames = frames; @@ -225,17 +225,19 @@ unsigned int CAESinkAUDIOTRACK::AddPackets(uint8_t *data, unsigned int frames, b { switch(m_format.m_dataFormat) { + // 99.95 percent of Android is LE so treat NE the same. case AE_FMT_S16LE: + case AE_FMT_S16NE: m_sinkbuffer->Write(data, write_frames * m_sink_frameSize); m_wake.Set(); break; #if defined(__ARM_NEON__) case AE_FMT_FLOAT: - if (!m_alignedS16LE) - m_alignedS16LE = (int16_t*)_aligned_malloc(m_format.m_frames * m_sink_frameSize, 16); + if (!m_alignedS16) + m_alignedS16 = (int16_t*)_aligned_malloc(m_format.m_frames * m_sink_frameSize, 16); // neon convert AE_FMT_S16LE to AE_FMT_FLOAT - pa_sconv_s16le_from_f32ne_neon(write_frames * m_format.m_channelLayout.Count(), (const float32_t *)data, m_alignedS16LE); - m_sinkbuffer->Write((unsigned char*)m_alignedS16LE, write_frames * m_sink_frameSize); + pa_sconv_s16le_from_f32ne_neon(write_frames * m_format.m_channelLayout.Count(), (const float32_t *)data, m_alignedS16); + m_sinkbuffer->Write((unsigned char*)m_alignedS16, write_frames * m_sink_frameSize); m_wake.Set(); break; #endif @@ -282,6 +284,7 @@ void CAESinkAUDIOTRACK::EnumerateDevicesEx(AEDeviceInfoList &list, bool force) m_info.m_sampleRates.push_back(44100); m_info.m_sampleRates.push_back(48000); m_info.m_dataFormats.push_back(AE_FMT_S16LE); + m_info.m_dataFormats.push_back(AE_FMT_S16NE); #if defined(__ARM_NEON__) if (g_cpuInfo.GetCPUFeatures() & CPU_FEATURE_NEON) m_info.m_dataFormats.push_back(AE_FMT_FLOAT); diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h index d07ab8d81c..f3ab8c218f 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h +++ b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h @@ -53,7 +53,7 @@ private: double m_volume; bool m_volume_changed; volatile int m_min_frames; - int16_t *m_alignedS16LE; + int16_t *m_alignedS16; AERingBuffer *m_sinkbuffer; unsigned int m_sink_frameSize; double m_sinkbuffer_sec; |