3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-16 17:51:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

CoreAudio plays synchronous

Browse source
This commit is contained in:
Johannes Pohl 2016-09-14 10:16:39 +02:00
parent 20ab3deedb
commit d196441f7c
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
client/player/coreAudioPlayer.cpp
View file

@ -17,11 +17,10 @@
***/ ***/
#include <unistd.h> #include <unistd.h>
#include "coreAudioPlayer.h" #include "coreAudioPlayer.h"
#define NUM_BUFFERS 2
//http://stackoverflow.com/questions/4863811/how-to-use-audioqueue-to-play-a-sound-for-mac-osx-in-c //http://stackoverflow.com/questions/4863811/how-to-use-audioqueue-to-play-a-sound-for-mac-osx-in-c
//https://gist.github.com/andormade/1360885 //https://gist.github.com/andormade/1360885
@ -48,8 +47,15 @@ CoreAudioPlayer::~CoreAudioPlayer()
void CoreAudioPlayer::playerCallback(AudioQueueRef queue, AudioQueueBufferRef bufferRef) void CoreAudioPlayer::playerCallback(AudioQueueRef queue, AudioQueueBufferRef bufferRef)
{ {
//logO << "Callback\n"; /// Estimate the playout delay by checking the number of frames left in the buffer
chronos::usec delay(ms_ * 1000); /// and add ms_ (= complete buffer size). Based on trying.
AudioTimeStamp timestamp;
AudioQueueGetCurrentTime(queue, timeLine, &timestamp, NULL);
size_t bufferedFrames = (frames_ - ((uint64_t)timestamp.mSampleTime % frames_)) % frames_;
size_t bufferedMs = bufferedFrames * 1000 / pubStream_->getFormat().rate + (ms_ * (NUM_BUFFERS - 1));
// logO << "buffered: " << bufferedFrames << ", ms: " << bufferedMs << ", mSampleTime: " << timestamp.mSampleTime << "\n";
chronos::usec delay(bufferedMs * 1000);
char *buffer = (char*)bufferRef->mAudioData; char *buffer = (char*)bufferRef->mAudioData;
if (!pubStream_->getPlayerChunk(buffer, delay, frames_)) if (!pubStream_->getPlayerChunk(buffer, delay, frames_))
{ {
@ -75,12 +81,9 @@ void CoreAudioPlayer::playerCallback(AudioQueueRef queue, AudioQueueBufferRef bu
void CoreAudioPlayer::worker() void CoreAudioPlayer::worker()
{ {
AudioStreamBasicDescription format;
AudioQueueRef queue;
AudioQueueBufferRef buffers[2];
const SampleFormat& sampleFormat = pubStream_->getFormat(); const SampleFormat& sampleFormat = pubStream_->getFormat();
AudioStreamBasicDescription format;
format.mSampleRate = sampleFormat.rate; format.mSampleRate = sampleFormat.rate;
format.mFormatID = kAudioFormatLinearPCM; format.mFormatID = kAudioFormatLinearPCM;
format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;// | kAudioFormatFlagIsPacked; format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger;// | kAudioFormatFlagIsPacked;
@ -91,14 +94,17 @@ void CoreAudioPlayer::worker()
format.mBytesPerPacket = format.mBytesPerFrame * format.mFramesPerPacket; format.mBytesPerPacket = format.mBytesPerFrame * format.mFramesPerPacket;
format.mReserved = 0; format.mReserved = 0;
AudioQueueRef queue;
AudioQueueNewOutput(&format, callback, this, CFRunLoopGetCurrent(), kCFRunLoopCommonModes, 0, &queue); AudioQueueNewOutput(&format, callback, this, CFRunLoopGetCurrent(), kCFRunLoopCommonModes, 0, &queue);
AudioQueueCreateTimeline(queue, &timeLine);
frames_ = (sampleFormat.rate * ms_) / 1000; frames_ = (sampleFormat.rate * ms_) / 1000;
ms_ = frames_ * 1000 / sampleFormat.rate; ms_ = frames_ * 1000 / sampleFormat.rate;
logO << "frames: " << frames_ << ", ms: " << ms_ << "\n"; logO << "frames: " << frames_ << ", ms: " << ms_ << "\n";
buff_size_ = frames_ * sampleFormat.frameSize; buff_size_ = frames_ * sampleFormat.frameSize;
for (int i = 0; i < 2; i++) AudioQueueBufferRef buffers[NUM_BUFFERS];
for (int i = 0; i < NUM_BUFFERS; i++)
{ {
AudioQueueAllocateBuffer(queue, buff_size_, &buffers[i]); AudioQueueAllocateBuffer(queue, buff_size_, &buffers[i]);
buffers[i]->mAudioDataByteSize = buff_size_; buffers[i]->mAudioDataByteSize = buff_size_;
@ -106,7 +112,9 @@ void CoreAudioPlayer::worker()
} }
logE << "CoreAudioPlayer::worker\n"; logE << "CoreAudioPlayer::worker\n";
AudioQueueCreateTimeline(queue, &timeLine);
AudioQueueStart(queue, NULL); AudioQueueStart(queue, NULL);
CFRunLoopRun(); CFRunLoopRun();
} }

1
client/player/coreAudioPlayer.h
View file

@ -40,6 +40,7 @@ public:
protected: protected:
virtual void worker(); virtual void worker();
AudioQueueTimelineRef timeLine;
size_t ms_; size_t ms_;
size_t frames_; size_t frames_;
size_t buff_size_; size_t buff_size_;