Fix compile error

This commit is contained in:
badaix 2020-02-18 23:24:25 +01:00
parent 1bc8f74c41
commit 0de2bbde36

View file

@ -95,7 +95,7 @@ void CoreAudioPlayer::playerCallback(AudioQueueRef queue, AudioQueueBufferRef bu
AudioTimeStamp timestamp; AudioTimeStamp timestamp;
AudioQueueGetCurrentTime(queue, timeLine_, &timestamp, NULL); AudioQueueGetCurrentTime(queue, timeLine_, &timestamp, NULL);
size_t bufferedFrames = (frames_ - ((uint64_t)timestamp.mSampleTime % frames_)) % frames_; size_t bufferedFrames = (frames_ - ((uint64_t)timestamp.mSampleTime % frames_)) % frames_;
size_t bufferedMs = bufferedFrames * 1000 / pubStream_->getFormat().rate + (ms_ * (NUM_BUFFERS - 1)); size_t bufferedMs = bufferedFrames * 1000 / pubStream_->getFormat().rate() + (ms_ * (NUM_BUFFERS - 1));
/// 15ms DAC delay. Based on trying. /// 15ms DAC delay. Based on trying.
bufferedMs += 15; bufferedMs += 15;
// LOG(INFO) << "buffered: " << bufferedFrames << ", ms: " << bufferedMs << ", mSampleTime: " << timestamp.mSampleTime << "\n"; // LOG(INFO) << "buffered: " << bufferedFrames << ", ms: " << bufferedMs << ", mSampleTime: " << timestamp.mSampleTime << "\n";
@ -158,7 +158,7 @@ void CoreAudioPlayer::initAudioQueue()
format.mSampleRate = sampleFormat.rate(); format.mSampleRate = sampleFormat.rate();
format.mFormatID = kAudioFormatLinearPCM; format.mFormatID = kAudioFormatLinearPCM;
format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; // | kAudioFormatFlagIsPacked; format.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger; // | kAudioFormatFlagIsPacked;
format.mBitsPerChannel = sampleFormat.bits; format.mBitsPerChannel = sampleFormat.bits();
format.mChannelsPerFrame = sampleFormat.channels(); format.mChannelsPerFrame = sampleFormat.channels();
format.mBytesPerFrame = sampleFormat.frameSize(); format.mBytesPerFrame = sampleFormat.frameSize();
format.mFramesPerPacket = 1; format.mFramesPerPacket = 1;