Changeset b257b60 for src/io/audio_unit.c

Timestamp:

Aug 12, 2015, 7:21:38 PM (10 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

60fc05b

Parents:

3a1a5d6 (diff), 7b2d740 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into notes

File:

• src/io/audio_unit.c (modified) (1 diff)

src/io/audio_unit.c

@@ -234 +234 @@
   audioFormat.mChannelsPerFrame = 2;
   audioFormat.mFormatID = kAudioFormatLinearPCM;
-  audioFormat.mFormatFlags = kAudioFormatFlagsCanonical;
+  audioFormat.mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked;
   audioFormat.mFramesPerPacket = 1;
-  audioFormat.mBitsPerChannel = 8 * sizeof(AudioSampleType);
+  audioFormat.mBitsPerChannel = 8 * sizeof(SInt16);
 #if 1  // interleaving
-  audioFormat.mBytesPerFrame = 2 * sizeof(AudioSampleType);
-  audioFormat.mBytesPerPacket = 2 * sizeof(AudioSampleType);
+  audioFormat.mBytesPerFrame = 2 * sizeof(SInt16);
+  audioFormat.mBytesPerPacket = 2 * sizeof(SInt16);
 #else
-  audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame = sizeof(AudioUnitSampleType);
+  audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame = sizeof(SInt32);
   audioFormat.mFormatFlags |= kAudioFormatFlagIsNonInterleaved;
 #endif