diff options
| author | Robin Gareus <robin@gareus.org> | 2017-09-19 04:46:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-09-19 04:47:10 +0200 |
| commit | 1ec471c961c328ca4c585d35f9e567135f301d2d (patch) | |
| tree | e2dde67c940425f699b5b5311b8bb81d197da298 /libs/backends/coreaudio | |
| parent | c8a9b28d3bee57604c5f8e4241f6f3ea10402f2c (diff) | |
partially revert 30b087ab3, CoreAudio SDK uses "Frames"
Diffstat (limited to 'libs/backends/coreaudio')
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_pcmio.cc | 14 | ||||
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_pcmio.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/libs/backends/coreaudio/coreaudio_pcmio.cc b/libs/backends/coreaudio/coreaudio_pcmio.cc index 8b2f9255d3..480fa6f424 100644 --- a/libs/backends/coreaudio/coreaudio_pcmio.cc +++ b/libs/backends/coreaudio/coreaudio_pcmio.cc @@ -752,7 +752,7 @@ static void PrintStreamDesc (AudioStreamBasicDescription *inDesc) printf (" Format ID:%.*s\n", (int)sizeof(inDesc->mFormatID), (char*)&inDesc->mFormatID); printf (" Format Flags:%X\n", (unsigned int)inDesc->mFormatFlags); printf (" Bytes per Packet:%d\n", (int)inDesc->mBytesPerPacket); - printf (" Samples per Packet:%d\n", (int)inDesc->mSamplesPerPacket); + printf (" Frames per Packet:%d\n", (int)inDesc->mFramesPerPacket); printf (" Bytes per Frame:%d\n", (int)inDesc->mBytesPerFrame); printf (" Channels per Frame:%d\n", (int)inDesc->mChannelsPerFrame); printf (" Bits per Channel:%d\n", (int)inDesc->mBitsPerChannel); @@ -895,7 +895,7 @@ CoreAudioPCM::pcm_start ( srcFormat.mFormatID = kAudioFormatLinearPCM; srcFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kLinearPCMFormatFlagIsNonInterleaved; srcFormat.mBytesPerPacket = sizeof(float); - srcFormat.mSamplesPerPacket = 1; + srcFormat.mFramesPerPacket = 1; srcFormat.mBytesPerFrame = sizeof(float); srcFormat.mChannelsPerFrame = chn_in; srcFormat.mBitsPerChannel = 32; @@ -903,8 +903,8 @@ CoreAudioPCM::pcm_start ( err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Output, AUHAL_INPUT_ELEMENT, &srcFormat, sizeof(AudioStreamBasicDescription)); if (err != noErr) { errorMsg="kAudioUnitProperty_StreamFormat, Output"; _state = -6; goto error; } - err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_MaximumSamplesPerSlice, kAudioUnitScope_Global, AUHAL_INPUT_ELEMENT, (UInt32*)&_samples_per_period, sizeof(UInt32)); - if (err != noErr) { errorMsg="kAudioUnitProperty_MaximumSamplesPerSlice, Input"; _state = -6; goto error; } + err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, AUHAL_INPUT_ELEMENT, (UInt32*)&_samples_per_period, sizeof(UInt32)); + if (err != noErr) { errorMsg="kAudioUnitProperty_MaximumFramesPerSlice, Input"; _state = -6; goto error; } } if (chn_out > 0) { @@ -912,7 +912,7 @@ CoreAudioPCM::pcm_start ( dstFormat.mFormatID = kAudioFormatLinearPCM; dstFormat.mFormatFlags = kAudioFormatFlagsNativeFloatPacked | kLinearPCMFormatFlagIsNonInterleaved; dstFormat.mBytesPerPacket = sizeof(float); - dstFormat.mSamplesPerPacket = 1; + dstFormat.mFramesPerPacket = 1; dstFormat.mBytesPerFrame = sizeof(float); dstFormat.mChannelsPerFrame = chn_out; dstFormat.mBitsPerChannel = 32; @@ -920,8 +920,8 @@ CoreAudioPCM::pcm_start ( err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, AUHAL_OUTPUT_ELEMENT, &dstFormat, sizeof(AudioStreamBasicDescription)); if (err != noErr) { errorMsg="kAudioUnitProperty_StreamFormat Input"; _state = -5; goto error; } - err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_MaximumSamplesPerSlice, kAudioUnitScope_Global, AUHAL_OUTPUT_ELEMENT, (UInt32*)&_samples_per_period, sizeof(UInt32)); - if (err != noErr) { errorMsg="kAudioUnitProperty_MaximumSamplesPerSlice, Output"; _state = -5; goto error; } + err = AudioUnitSetProperty(_auhal, kAudioUnitProperty_MaximumFramesPerSlice, kAudioUnitScope_Global, AUHAL_OUTPUT_ELEMENT, (UInt32*)&_samples_per_period, sizeof(UInt32)); + if (err != noErr) { errorMsg="kAudioUnitProperty_MaximumFramesPerSlice, Output"; _state = -5; goto error; } } /* read back stream descriptions */ diff --git a/libs/backends/coreaudio/coreaudio_pcmio.h b/libs/backends/coreaudio/coreaudio_pcmio.h index e6d82571f4..5f9778e845 100644 --- a/libs/backends/coreaudio/coreaudio_pcmio.h +++ b/libs/backends/coreaudio/coreaudio_pcmio.h @@ -126,7 +126,7 @@ public: AudioUnitRenderActionFlags* ioActionFlags, const AudioTimeStamp* inTimeStamp, UInt32 inBusNumber, - UInt32 inNumberSamples, + UInt32 inNumberFrames, AudioBufferList* ioData); void xrun_callback (); |