diff --git a/src/contrib/alsaout/AlsaOut.cpp b/src/contrib/alsaout/AlsaOut.cpp index 4e1ca9ab3..05f7273d7 100755 --- a/src/contrib/alsaout/AlsaOut.cpp +++ b/src/contrib/alsaout/AlsaOut.cpp @@ -35,12 +35,14 @@ #define BUFFER_COUNT 8 #define PCM_ACCESS_TYPE SND_PCM_ACCESS_RW_INTERLEAVED -#define PCM_FORMAT SND_PCM_FORMAT_S16_LE +#define PCM_FORMAT SND_PCM_FORMAT_FLOAT_LE #define LOCK() boost::recursive_mutex::scoped_lock lock(this->stateMutex); #define WAIT() this->threadEvent.wait(lock); #define NOTIFY() this->threadEvent.notify_all(); #define CHECK_QUIT() if (this->quit) { return; } #define PRINT_ERROR(x) std::cerr << "AlsaOut: error! " << snd_strerror(x) << std::endl; +#define BUFFER_TIME_MICROS 10000 +#define PERIOD_TIME_MICROS 25000 using namespace musik::core::audio; @@ -56,7 +58,6 @@ AlsaOut::AlsaOut() this->writeThread.reset(new boost::thread(boost::bind(&AlsaOut::WriteLoop, this))); } - AlsaOut::~AlsaOut() { std::cerr << "AlsaOut: destructor\n"; @@ -77,7 +78,10 @@ AlsaOut::~AlsaOut() { } void AlsaOut::InitDevice() { - int err; + int err, dir; + size_t rate = this->rate; + size_t bufferTime = BUFFER_TIME_MICROS; + size_t periodTime = PERIOD_TIME_MICROS; if ((err = snd_pcm_open(&this->pcmHandle, this->device.c_str(), SND_PCM_STREAM_PLAYBACK, 0)) < 0) { std::cerr << "AlsaOut: cannot open audio device 'default' :" << snd_strerror(err) << std::endl; @@ -93,8 +97,8 @@ void AlsaOut::InitDevice() { std::cerr << "AlsaOut: cannot initialize hardware parameter structure " << snd_strerror(err) << std::endl; goto error; } - - if ((err = snd_pcm_hw_params_set_access (pcmHandle, hardware, PCM_ACCESS_TYPE)) < 0) { + + if ((err = snd_pcm_hw_params_set_access(pcmHandle, hardware, PCM_ACCESS_TYPE)) < 0) { std::cerr << "AlsaOut: cannot set access type " << snd_strerror(err) << std::endl; goto error; } @@ -104,7 +108,7 @@ void AlsaOut::InitDevice() { goto error; } - if ((err = snd_pcm_hw_params_set_rate_resample(pcmHandle, hardware, this->rate)) < 0) { + if ((err = snd_pcm_hw_params_set_rate_near(pcmHandle, hardware, &rate, 0)) < 0) { std::cerr << "AlsaOut: cannot set sample rate " << snd_strerror(err) << std::endl; goto error; } @@ -114,6 +118,16 @@ void AlsaOut::InitDevice() { goto error; } + if ((err = snd_pcm_hw_params_set_buffer_time_near(pcmHandle, hardware, &bufferTime, &dir)) < 0) { + std::cerr << "AlsaOut: cannot set buffer time " << snd_strerror(err) << std::endl; + goto error; + } + + if ((err = snd_pcm_hw_params_set_period_time_near(pcmHandle, hardware, &periodTime, &dir)) < 0) { + std::cerr << "AlsaOut: cannot set period time " << snd_strerror(err) << std::endl; + goto error; + } + if ((err = snd_pcm_hw_params(pcmHandle, hardware)) < 0) { std::cerr << "AlsaOut: cannot set parameters " << snd_strerror(err) << std::endl; goto error; @@ -151,12 +165,16 @@ void AlsaOut::Stop() { } void AlsaOut::Pause() { + LOCK(); + if (this->pcmHandle) { snd_pcm_pause(this->pcmHandle, 1); } } void AlsaOut::Resume() { + LOCK(); + if (this->pcmHandle) { snd_pcm_pause(this->pcmHandle, 0); } @@ -190,41 +208,53 @@ void AlsaOut::WriteLoop() { this->buffers.pop_front(); } + int err; + if (next) { size_t samples = next->buffer->Samples(); - int err = snd_pcm_writei( - this->pcmHandle, - next->buffer->BufferPointer(), - samples); + { + LOCK(); - std::cerr << err << std::endl; + err = snd_pcm_writei( + this->pcmHandle, + next->buffer->BufferPointer(), + samples); + } - // if (err < 0) { - // err = snd_pcm_recover(this->pcmHandle, samples, 0); - // } + // if (err < 0) { + // err = snd_pcm_recover(this->pcmHandle, samples, 0); + // } - if (err < 0) { + if (err < 0) { PRINT_ERROR(err); - } + } - if (err > 0 && err < (int) samples) { + if (err > 0 && err < (int) samples) { std::cerr << "AlsaOut: short write. expected=" << samples << ", actual=" << err << std::endl; - } + } - next->provider->OnBufferProcessed(next->buffer); + next->provider->OnBufferProcessed(next->buffer); } } } } +static inline bool playable(snd_pcm_t* pcm) { + snd_pcm_state_t state = snd_pcm_state(pcm); + + return + state == SND_PCM_STATE_RUNNING || + state == SND_PCM_STATE_PREPARED; +} + bool AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) { this->SetFormat(buffer); { LOCK(); - if (this->buffers.size() >= BUFFER_COUNT) { + if (!playable(this->pcmHandle) || this->buffers.size() >= BUFFER_COUNT) { return false; } @@ -241,6 +271,8 @@ bool AlsaOut::Play(IBuffer *buffer, IBufferProvider* provider) { } void AlsaOut::SetFormat(IBuffer *buffer) { + LOCK(); + if (this->channels != buffer->Channels() || this->rate != buffer->SampleRate() || this->pcmHandle == NULL) diff --git a/src/core/audio/Player.cpp b/src/core/audio/Player.cpp index 0e6ab88ed..86373d861 100644 --- a/src/core/audio/Player.cpp +++ b/src/core/audio/Player.cpp @@ -188,10 +188,10 @@ void Player::ThreadLoop() { /* if we have a decoded, processed buffer available. let's try to send it to the output device. */ if (buffer) { + boost::mutex::scoped_lock lock(this->mutex); + if (this->output->Play(buffer.get(), this)) { /* success! the buffer was accepted by the output.*/ - boost::mutex::scoped_lock lock(this->mutex); - /* lock it down so it's not destroyed until the output device lets us know it's done with it. */ this->lockedBuffers.push_back(buffer); @@ -205,7 +205,6 @@ void Player::ThreadLoop() { else { /* the output device queue is full. we should block and wait until the output lets us know that it needs more data */ - boost::mutex::scoped_lock lock(this->mutex); writeToOutputCondition.wait(this->mutex); } } @@ -292,6 +291,11 @@ void Player::OnBufferProcessed(IBuffer *buffer) { if (!this->lockedBuffers.empty()) { this->currentPosition = this->lockedBuffers.front()->Position(); } + else { + /* if the queue is drained, use the position from the buffer + that was just processed */ + this->currentPosition = ((Buffer*) buffer)->Position(); + } /* if the output device's internal buffers are full, it will stop accepting new samples. now that a buffer has been processed, we can