3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-05 04:11:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change SampleFormat variables to getters

Browse source
This commit is contained in:
badaix 2020-02-18 22:47:04 +01:00
parent 96856ae5a6
commit 1bc8f74c41
17 changed files with 164 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/player/coreaudio_player.cpp
View file

@ -155,12 +155,12 @@ void CoreAudioPlayer::initAudioQueue()
const SampleFormat& sampleFormat = pubStream_->getFormat();
AudioStreamBasicDescription format;
format.mSampleRate = sampleFormat.rate;
format.mSampleRate = sampleFormat.rate();
format.mFormatID = kAudioFormatLinearPCM;
format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; // | kAudioFormatFlagIsPacked;
format.mBitsPerChannel = sampleFormat.bits;
format.mChannelsPerFrame = sampleFormat.channels;
format.mBytesPerFrame = sampleFormat.frameSize;
format.mChannelsPerFrame = sampleFormat.channels();
format.mBytesPerFrame = sampleFormat.frameSize();
format.mFramesPerPacket = 1;
format.mBytesPerPacket = format.mBytesPerFrame * format.mFramesPerPacket;
format.mReserved = 0;
@ -176,9 +176,9 @@ void CoreAudioPlayer::initAudioQueue()
//
// For 100ms @ 48000:16:2 we have 19.2K
// frames: 4800, ms: 100, buffer size: 19200
frames_ = (sampleFormat.rate * ms_) / 1000;
ms_ = frames_ * 1000 / sampleFormat.rate;
buff_size_ = frames_ * sampleFormat.frameSize;
frames_ = (sampleFormat.rate() * ms_) / 1000;
ms_ = frames_ * 1000 / sampleFormat.rate();
buff_size_ = frames_ * sampleFormat.frameSize();
LOG(INFO) << "frames: " << frames_ << ", ms: " << ms_ << ", buffer size: " << buff_size_ << "\n";
AudioQueueBufferRef buffers[NUM_BUFFERS];