From b540f90ce818a070d28528bdf3249ca51da784d2 Mon Sep 17 00:00:00 2001 From: shogo4405 Date: Sun, 7 Oct 2018 17:48:51 +0900 Subject: [PATCH] fix compile error --- Tests/Codec/AACEncoderTests.swift | 6 ++--- Tests/SinWaveUtil.swift | 38 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Tests/Codec/AACEncoderTests.swift b/Tests/Codec/AACEncoderTests.swift index 849bba088..f93a833f7 100644 --- 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?, 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 index 1d2ab44b4..00916960f 100644 --- 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,7 +24,7 @@ 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 { @@ -32,18 +32,18 @@ final class SinWaveUtil { } 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 {