fix compile error

shogo4405 · Oct 7, 2018 · b540f90 · b540f90
1 parent 9409ce6
commit b540f90
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/Tests/Codec/AACEncoderTests.swift b/Tests/Codec/AACEncoderTests.swift
@@ -59,10 +59,10 @@ final class AACEncoderTests: XCTestCase {
 
 extension AACEncoderTests: AudioEncoderDelegate {
     // MARK: AudioEncoderDelegate
-    func didSetFormatDescription(audio formatDescription: CMFormatDescription?) {
+    func sampleOutput(audio bytes: UnsafeMutablePointer<UInt8>?, count: UInt32, presentationTimeStamp: CMTime) {
+
     }
 
-    func sampleOutput(audio sampleBuffer: CMSampleBuffer) {
-        // print(sampleBuffer.dataBuffer?.data)
+    func didSetFormatDescription(audio formatDescription: CMFormatDescription?) {
     }
 }
diff --git a/Tests/SinWaveUtil.swift b/Tests/SinWaveUtil.swift
@@ -7,8 +7,8 @@ final class SinWaveUtil {
         var formatDescription: CMAudioFormatDescription? = nil
         var timing: CMSampleTimingInfo = CMSampleTimingInfo(
             duration: CMTime(value: 1, timescale: Int32(sampleRate)),
-            presentationTimeStamp: kCMTimeZero,
-            decodeTimeStamp: kCMTimeInvalid
+            presentationTimeStamp: CMTime.zero,
+            decodeTimeStamp: CMTime.invalid
         )
 
         var asbd = AudioStreamBasicDescription(
@@ -24,26 +24,26 @@ final class SinWaveUtil {
         )
 
         status = CMAudioFormatDescriptionCreate(
-            kCFAllocatorDefault, &asbd, 0, nil, 0, nil, nil, &formatDescription
+            allocator: kCFAllocatorDefault, asbd: &asbd, layoutSize: 0, layout: nil, magicCookieSize: 0, magicCookie: nil, extensions: nil, formatDescriptionOut: &formatDescription
         )
 
         guard status == noErr else {
             return nil
         }
 
         status = CMSampleBufferCreate(
-            kCFAllocatorDefault,
-            nil,
-            false,
-            nil,
-            nil,
-            formatDescription,
-            numSamples,
-            1,
-            &timing,
-            0,
-            nil,
-            &sampleBuffer
+            allocator: kCFAllocatorDefault,
+            dataBuffer: nil,
+            dataReady: false,
+            makeDataReadyCallback: nil,
+            refcon: nil,
+            formatDescription: formatDescription,
+            sampleCount: numSamples,
+            sampleTimingEntryCount: 1,
+            sampleTimingArray: &timing,
+            sampleSizeEntryCount: 0,
+            sampleSizeArray: nil,
+            sampleBufferOut: &sampleBuffer
         )
 
         guard status == noErr else {
@@ -63,10 +63,10 @@ final class SinWaveUtil {
 
         status = CMSampleBufferSetDataBufferFromAudioBufferList(
             sampleBuffer!,
-            kCFAllocatorDefault,
-            kCFAllocatorDefault,
-            0,
-            buffer.audioBufferList
+            blockBufferAllocator: kCFAllocatorDefault,
+            blockBufferMemoryAllocator: kCFAllocatorDefault,
+            flags: 0,
+            bufferList: buffer.audioBufferList
         )
 
         guard status == noErr else {