comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

switch from portaudio -> libao

This commit is contained in:
Charles J. Cliffe 2014-11-19 23:41:57 -05:00
parent a9d46b7624
commit 8972e87765
3 changed files with 46 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -63,10 +63,6 @@ if (DEFINED WIN32)
link_directories ( ${PROJECT_SOURCE_DIR}/external/fftw-3.3.4-dll32 ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release/x32 ) link_directories ( ${PROJECT_SOURCE_DIR}/external/fftw-3.3.4-dll32 ${PROJECT_SOURCE_DIR}/external/rtl-sdr-release/x32 )
set(FFTW_LIB fftw3-3) set(FFTW_LIB fftw3-3)
include_directories ( ${PROJECT_SOURCE_DIR}/external/portaudio/include )
link_directories ( ${PROJECT_SOURCE_DIR}/external/portaudio/libs )
SET (PORTAUDIO_LIBRARY portaudio.dll winmm)
link_directories ( ${PROJECT_SOURCE_DIR}/external/liquid-dsp/lib ) link_directories ( ${PROJECT_SOURCE_DIR}/external/liquid-dsp/lib )
include_directories ( ${PROJECT_SOURCE_DIR}/external/liquid-dsp/include ) include_directories ( ${PROJECT_SOURCE_DIR}/external/liquid-dsp/include )
else (DEFINED WIN32) else (DEFINED WIN32)
@ -77,7 +73,6 @@ else (DEFINED WIN32)
set(FFTW_LIB fftw3) set(FFTW_LIB fftw3)
SET (PORTAUDIO_LIBRARY portaudio)
endif (DEFINED WIN32) endif (DEFINED WIN32)
@ -147,7 +142,7 @@ ADD_DEFINITIONS(
add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers}) add_executable(CubicSDR ${cubicsdr_sources} ${cubicsdr_headers})
target_link_libraries(CubicSDR rtlsdr liquid ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES} ${PORTAUDIO_LIBRARY}) target_link_libraries(CubicSDR rtlsdr liquid ao ${FFTW_LIB} ${wxWidgets_LIBRARIES} ${OPENGL_LIBRARIES})
# cubicvr2 glfw ${GLFW_LIBRARIES} # cubicvr2 glfw ${GLFW_LIBRARIES}

179
src/audio/AudioThread.cpp
View File

@ -2,165 +2,70 @@
#include "CubicSDRDefs.h" #include "CubicSDRDefs.h"
#include <vector> #include <vector>
#ifdef WIN32
#include <algorithm>
#include <functional>
#include <cctype>
#include <locale>
#include <sstream>
// trim from start
static inline std::wstring &wltrim(std::wstring &s) {
s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
return s;
}
// trim from end
static inline std::wstring &wrtrim(std::wstring &s) {
s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
return s;
}
// trim from both ends
static inline std::wstring &wtrim(std::wstring &s) {
return wltrim(wrtrim(s));
}
#endif
//wxDEFINE_EVENT(wxEVT_COMMAND_AudioThread_INPUT, wxThreadEvent); //wxDEFINE_EVENT(wxEVT_COMMAND_AudioThread_INPUT, wxThreadEvent);
AudioThread::AudioThread(AudioThreadQueue* pQueue, int id) : AudioThread::AudioThread(AudioThreadQueue* pQueue, int id) :
wxThread(wxTHREAD_DETACHED), m_pQueue(pQueue), m_ID(id), audio_queue_ptr(0), stream(NULL) { wxThread(wxTHREAD_DETACHED), m_pQueue(pQueue), m_ID(id), audio_queue_ptr(
0) { //, stream(NULL)
} }
AudioThread::~AudioThread() { AudioThread::~AudioThread() {
PaError err; ao_close(device);
err = Pa_StopStream(stream); ao_shutdown();
err = Pa_CloseStream(stream);
Pa_Terminate();
} }
static int audioCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo,
PaStreamCallbackFlags statusFlags, void *userData) {
AudioThread *src = (AudioThread *) userData;
float *out = (float*) outputBuffer;
if (statusFlags & paOutputOverflow) {
std::cout << "Audio buffer overflow.." << std::endl;
}
if (statusFlags & paOutputUnderflow) {
std::cout << "Audio buffer underflow.." << std::endl;
}
if ((statusFlags & paPrimingOutput) || (statusFlags & paOutputOverflow) || !src->audio_queue.size()) {
for (int i = 0; i < framesPerBuffer * 2; i++) {
out[i] = 0;
}
return paContinue;
}
std::vector<float> nextBuffer = src->audio_queue.front();
for (int i = 0; i < framesPerBuffer * 2; i++) {
out[i] = nextBuffer[src->audio_queue_ptr];
src->audio_queue_ptr++;
if (src->audio_queue_ptr == nextBuffer.size()) {
src->audio_queue.pop();
src->audio_queue_ptr = 0;
if (!src->audio_queue.size()) {
break;
}
nextBuffer = src->audio_queue.front();
}
}
return paContinue;
}
wxThread::ExitCode AudioThread::Entry() { wxThread::ExitCode AudioThread::Entry() {
PaError err; ao_initialize();
err = Pa_Initialize();
if (err != paNoError) {
std::cout << "Error starting :(\n";
return (wxThread::ExitCode) 1;
}
int preferred_device = -1; /* -- Setup for default driver -- */
#ifdef WIN32 int default_driver;
wchar_t dev_str[255];
memset(dev_str, 0, sizeof(wchar_t) * 255);
std::wstring env_name(L"PA_RECOMMENDED_OUTPUT_DEVICE");
GetEnvironmentVariable(wtrim(env_name).c_str(), dev_str, 255);
std::wistringstream env_result(dev_str);
if (!env_result.eof()) { default_driver = ao_default_driver_id();
int env_dev = -1;
env_result >> env_dev;
if (env_result.eof()) { // read everything, was all a number memset(&format, 0, sizeof(format));
if (env_dev >= 0) { format.bits = 16;
std::cout << "Using preferred PortAudio device PA_RECOMMENDED_OUTPUT_DEVICE=" << env_dev << std::endl; format.channels = 2;
preferred_device = env_dev; format.rate = AUDIO_FREQUENCY;
} else { format.byte_format = AO_FMT_LITTLE;
std::cout << "Environment variable PA_RECOMMENDED_OUTPUT_DEVICE not set, using PortAudio defaults." << std::endl;
}
} else {
std::cout << "Environment variable PA_RECOMMENDED_OUTPUT_DEVICE didn't evaluate to a number, using PortAudio defaults." << std::endl;
}
}
#endif
outputParameters.device = (preferred_device != -1) ? preferred_device : Pa_GetDefaultOutputDevice(); /* -- Open driver -- */
if (outputParameters.device == paNoDevice) { device = ao_open_live(default_driver, &format, NULL /* no options */);
std::cout << "Error: No default output device.\n"; if (device == NULL) {
} fprintf(stderr, "Error opening device.\n");
return (wxThread::ExitCode) 1;
}
outputParameters.channelCount = 2; /* Stereo output, most likely supported. */ while (!TestDestroy()) {
outputParameters.sampleFormat = paFloat32; /* 32 bit floating point output. */
outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultLowOutputLatency;
outputParameters.hostApiSpecificStreamInfo = NULL;
stream = NULL; if (m_pQueue->stackSize()) {
err = Pa_OpenStream(&stream, NULL, &outputParameters, AUDIO_FREQUENCY, paFramesPerBufferUnspecified, paPrimeOutputBuffersUsingStreamCallback|paClipOff, &audioCallback, this); while (m_pQueue->stackSize()) {
AudioThreadTask task = m_pQueue->pop(); // pop a task from the queue. this will block the worker thread if queue is empty
switch (task.m_cmd) {
case AudioThreadTask::AUDIO_THREAD_DATA:
err = Pa_StartStream(stream); int16_t buf[task.data->data.size()];
if (err != paNoError) {
std::cout << "Error starting stream: " << Pa_GetErrorText(err) << std::endl;
std::cout << "\tPortAudio error: " << Pa_GetErrorText(err) << std::endl;
}
while (!TestDestroy()) { for (int i = 0; i < task.data->data.size(); i++) {
buf[i] = (int) (task.data->data[i] * 32760.0);
}
if (m_pQueue->stackSize()) { ao_play(device, (char *) buf,
task.data->data.size() * sizeof(int16_t));
while (m_pQueue->stackSize()) { delete task.data;
AudioThreadTask task = m_pQueue->pop(); // pop a task from the queue. this will block the worker thread if queue is empty break;
switch (task.m_cmd) { }
case AudioThreadTask::AUDIO_THREAD_DATA: }
if (!TestDestroy()) { } else {
audio_queue.push(task.data->data); this->Yield();
} this->Sleep(1);
delete task.data; }
break; }
} std::cout << std::endl << "Audio Thread Done." << std::endl << std::endl;
}
} else {
this->Yield();
this->Sleep(1);
}
}
std::cout << std::endl << "Audio Thread Done." << std::endl << std::endl;
return (wxThread::ExitCode) 0; return (wxThread::ExitCode) 0;
} }

12
src/audio/AudioThread.h
View File

@ -11,14 +11,8 @@
#include "wx/thread.h" #include "wx/thread.h"
#include "AudioThreadQueue.h" #include "AudioThreadQueue.h"
#include "portaudio.h"
#ifdef WIN32
#include "pa_stream.h"
#include "pa_debugprint.h"
#endif
static int audioCallback(const void *inputBuffer, void *outputBuffer, unsigned long framesPerBuffer, const PaStreamCallbackTimeInfo* timeInfo, #include "ao/ao.h"
PaStreamCallbackFlags statusFlags, void *userData);
class AudioThread: public wxThread { class AudioThread: public wxThread {
public: public:
@ -33,6 +27,6 @@ protected:
AudioThreadQueue* m_pQueue; AudioThreadQueue* m_pQueue;
int m_ID; int m_ID;
PaStreamParameters outputParameters; ao_device *device;
PaStream *stream; ao_sample_format format;
}; };