dnrops
/
HaishinKit.swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s/AudioConverter/AudioCodec/g

This commit is contained in:
shogo4405 2021-03-28 16:00:15 +09:00
parent e1184ce9c4
commit 7c542f02c9
12 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
HaishinKit.xcodeproj/project.pbxproj
View File

@ -144,16 +144,16 @@
29798E751CE614FE00F5CBD0 /* SampleVideo_360x240_5mb in Resources */ = {isa = PBXBuildFile; fileRef = 29B876D71CD70CE700FC07DA /* SampleVideo_360x240_5mb */; };
29798E761CE614FE00F5CBD0 /* SampleVideo_360x240_5mb.m3u8 in Resources */ = {isa = PBXBuildFile; fileRef = 29B876D81CD70CE700FC07DA /* SampleVideo_360x240_5mb.m3u8 */; };
29798E771CE614FE00F5CBD0 /* SampleVideo_360x240_5mb.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 29B876D91CD70CE700FC07DA /* SampleVideo_360x240_5mb.mp4 */; };
297E69122324E38800D418AB /* AudioConverter.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioConverter.Destination.swift */; };
297E69132324E38800D418AB /* AudioConverter.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioConverter.Destination.swift */; };
297E69142324E38800D418AB /* AudioConverter.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioConverter.Destination.swift */; };
297E69122324E38800D418AB /* AudioCodec.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioCodec.Destination.swift */; };
297E69132324E38800D418AB /* AudioCodec.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioCodec.Destination.swift */; };
297E69142324E38800D418AB /* AudioCodec.Destination.swift in Sources */ = {isa = PBXBuildFile; fileRef = 297E69112324E38800D418AB /* AudioCodec.Destination.swift */; };
298BCF331DD4C44A007FF86A /* AnyUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 298BCF321DD4C44A007FF86A /* AnyUtil.swift */; };
2992D1541ED04A2C008D9DC1 /* VideoIOComponent+Extension-macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2992D1521ED04A1B008D9DC1 /* VideoIOComponent+Extension-macOS.swift */; };
2999C3752071138F00892E55 /* MTHKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2999C3742071138F00892E55 /* MTHKView.swift */; };
299B13271D3B751400A1E8F5 /* HKView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 299B13261D3B751400A1E8F5 /* HKView.swift */; };
29AF3FCF1D7C744C00E41212 /* NetStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29AF3FCE1D7C744C00E41212 /* NetStream.swift */; };
29AF3FD01D7C745200E41212 /* NetStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29AF3FCE1D7C744C00E41212 /* NetStream.swift */; };
29B8765B1CD70A7900FC07DA /* AudioConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioConverter.swift */; };
29B8765B1CD70A7900FC07DA /* AudioCodec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioCodec.swift */; };
29B8765C1CD70A7900FC07DA /* H264Decoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876581CD70A7900FC07DA /* H264Decoder.swift */; };
29B8765D1CD70A7900FC07DA /* H264Encoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876591CD70A7900FC07DA /* H264Encoder.swift */; };
29B876691CD70AB300FC07DA /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876631CD70AB300FC07DA /* Constants.swift */; };
@ -164,7 +164,7 @@
29B876791CD70ACE00FC07DA /* HTTPStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876721CD70ACE00FC07DA /* HTTPStream.swift */; };
29B8767A1CD70ACE00FC07DA /* M3U.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876731CD70ACE00FC07DA /* M3U.swift */; };
29B876831CD70AE800FC07DA /* AudioSpecificConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767D1CD70AE800FC07DA /* AudioSpecificConfig.swift */; };
29B876841CD70AE800FC07DA /* H264+AVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* H264+AVC.swift */; };
29B876841CD70AE800FC07DA /* AVCConfigurationRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* AVCConfigurationRecord.swift */; };
29B876851CD70AE800FC07DA /* NALUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767F1CD70AE800FC07DA /* NALUnit.swift */; };
29B876861CD70AE800FC07DA /* PacketizedElementaryStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876801CD70AE800FC07DA /* PacketizedElementaryStream.swift */; };
29B876871CD70AE800FC07DA /* ProgramSpecific.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876811CD70AE800FC07DA /* ProgramSpecific.swift */; };
@ -190,7 +190,7 @@
29B876BC1CD70B3900FC07DA /* ByteArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876B81CD70B3900FC07DA /* ByteArray.swift */; };
29B876BD1CD70B3900FC07DA /* CRC32.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876B91CD70B3900FC07DA /* CRC32.swift */; };
29B876BE1CD70B3900FC07DA /* EventDispatcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876BA1CD70B3900FC07DA /* EventDispatcher.swift */; };
29B876EC1CD70D5900FC07DA /* AudioConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioConverter.swift */; };
29B876EC1CD70D5900FC07DA /* AudioCodec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioCodec.swift */; };
29B876ED1CD70D5900FC07DA /* H264Decoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876581CD70A7900FC07DA /* H264Decoder.swift */; };
29B876EE1CD70D5900FC07DA /* H264Encoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876591CD70A7900FC07DA /* H264Encoder.swift */; };
29B876F01CD70D5900FC07DA /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876631CD70AB300FC07DA /* Constants.swift */; };
@ -201,7 +201,7 @@
29B876F91CD70D5900FC07DA /* HTTPStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876721CD70ACE00FC07DA /* HTTPStream.swift */; };
29B876FA1CD70D5900FC07DA /* M3U.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876731CD70ACE00FC07DA /* M3U.swift */; };
29B876FD1CD70D5A00FC07DA /* AudioSpecificConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767D1CD70AE800FC07DA /* AudioSpecificConfig.swift */; };
29B876FE1CD70D5A00FC07DA /* H264+AVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* H264+AVC.swift */; };
29B876FE1CD70D5A00FC07DA /* AVCConfigurationRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* AVCConfigurationRecord.swift */; };
29B876FF1CD70D5A00FC07DA /* NALUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767F1CD70AE800FC07DA /* NALUnit.swift */; };
29B877001CD70D5A00FC07DA /* PacketizedElementaryStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876801CD70AE800FC07DA /* PacketizedElementaryStream.swift */; };
29B877011CD70D5A00FC07DA /* ProgramSpecific.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876811CD70AE800FC07DA /* ProgramSpecific.swift */; };
@ -269,7 +269,7 @@
29EB3DEA1ED055AC001CAE8B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 29D3D5021ED053C000DD4AA6 /* Main.storyboard */; };
29EB3DEB1ED055B0001CAE8B /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29D3D5051ED053C000DD4AA6 /* ViewController.swift */; };
29EB3DED1ED055B4001CAE8B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 29D3D5001ED053C000DD4AA6 /* Assets.xcassets */; };
29EB3DEE1ED05763001CAE8B /* AudioConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioConverter.swift */; };
29EB3DEE1ED05763001CAE8B /* AudioCodec.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876571CD70A7900FC07DA /* AudioCodec.swift */; };
29EB3DEF1ED05766001CAE8B /* H264Decoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876581CD70A7900FC07DA /* H264Decoder.swift */; };
29EB3DF01ED05768001CAE8B /* H264Encoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876591CD70A7900FC07DA /* H264Encoder.swift */; };
29EB3DF11ED0576C001CAE8B /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876631CD70AB300FC07DA /* Constants.swift */; };
@ -290,7 +290,7 @@
29EB3E011ED05856001CAE8B /* HTTPStream.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876721CD70ACE00FC07DA /* HTTPStream.swift */; };
29EB3E021ED05858001CAE8B /* M3U.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B876731CD70ACE00FC07DA /* M3U.swift */; };
29EB3E031ED0585D001CAE8B /* AudioSpecificConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767D1CD70AE800FC07DA /* AudioSpecificConfig.swift */; };
29EB3E041ED05860001CAE8B /* H264+AVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* H264+AVC.swift */; };
29EB3E041ED05860001CAE8B /* AVCConfigurationRecord.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767E1CD70AE800FC07DA /* AVCConfigurationRecord.swift */; };
29EB3E051ED05862001CAE8B /* MP4Reader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29798E511CE5DF1900F5CBD0 /* MP4Reader.swift */; };
29EB3E061ED05865001CAE8B /* MP4Sampler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 292D8A321D8B293300DBECE2 /* MP4Sampler.swift */; };
29EB3E071ED05867001CAE8B /* NALUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 29B8767F1CD70AE800FC07DA /* NALUnit.swift */; };
@ -358,9 +358,9 @@
BC34E00825EBB716005F975A /* Logboard.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = BC34DFD125EBB12C005F975A /* Logboard.xcframework */; };
BC3FA38B2413AEDA009C83D3 /* AVFoundation+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 292F6DB01EEBB2040097EDBE /* AVFoundation+Extension.swift */; };
BC3FA38C2413AEDA009C83D3 /* AVFoundation+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 292F6DB01EEBB2040097EDBE /* AVFoundation+Extension.swift */; };
BC44A1A923D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioConverter.AudioBuffer.swift */; };
BC44A1AA23D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioConverter.AudioBuffer.swift */; };
BC44A1AB23D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioConverter.AudioBuffer.swift */; };
BC44A1A923D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioCodec.AudioBuffer.swift */; };
BC44A1AA23D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioCodec.AudioBuffer.swift */; };
BC44A1AB23D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC44A1A823D31E92002D4297 /* AudioCodec.AudioBuffer.swift */; };
BC4C9EAC23F00F3A004A14F2 /* Preference.swift in Sources */ = {isa = PBXBuildFile; fileRef = 291468161E581C7D00E619BA /* Preference.swift */; };
BC4C9EAF23F2E736004A14F2 /* AudioStreamBasicDescription+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC4C9EAE23F2E736004A14F2 /* AudioStreamBasicDescription+Extension.swift */; };
BC4C9EB023F2E736004A14F2 /* AudioStreamBasicDescription+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC4C9EAE23F2E736004A14F2 /* AudioStreamBasicDescription+Extension.swift */; };
@ -583,7 +583,7 @@
29798E511CE5DF1900F5CBD0 /* MP4Reader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MP4Reader.swift; sourceTree = "<group>"; };
29798E591CE60E5300F5CBD0 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
29798E5D1CE60E5300F5CBD0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
297E69112324E38800D418AB /* AudioConverter.Destination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioConverter.Destination.swift; sourceTree = "<group>"; };
297E69112324E38800D418AB /* AudioCodec.Destination.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioCodec.Destination.swift; sourceTree = "<group>"; };
2981E1301D646E3F00E8F7CA /* Cartfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cartfile; sourceTree = "<group>"; };
298BCF321DD4C44A007FF86A /* AnyUtil.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnyUtil.swift; sourceTree = "<group>"; };
2992D1521ED04A1B008D9DC1 /* VideoIOComponent+Extension-macOS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "VideoIOComponent+Extension-macOS.swift"; sourceTree = "<group>"; };
@ -596,7 +596,7 @@
29A39C881D85BF30007C27E9 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
29AF3FCE1D7C744C00E41212 /* NetStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetStream.swift; sourceTree = "<group>"; };
29B8761B1CD701F900FC07DA /* HaishinKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = HaishinKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
29B876571CD70A7900FC07DA /* AudioConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioConverter.swift; sourceTree = "<group>"; };
29B876571CD70A7900FC07DA /* AudioCodec.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioCodec.swift; sourceTree = "<group>"; };
29B876581CD70A7900FC07DA /* H264Decoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = H264Decoder.swift; sourceTree = "<group>"; };
29B876591CD70A7900FC07DA /* H264Encoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = H264Encoder.swift; sourceTree = "<group>"; };
29B876631CD70AB300FC07DA /* Constants.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Constants.swift; sourceTree = "<group>"; };
@ -607,7 +607,7 @@
29B876721CD70ACE00FC07DA /* HTTPStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTTPStream.swift; sourceTree = "<group>"; };
29B876731CD70ACE00FC07DA /* M3U.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = M3U.swift; sourceTree = "<group>"; };
29B8767D1CD70AE800FC07DA /* AudioSpecificConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AudioSpecificConfig.swift; sourceTree = "<group>"; };
29B8767E1CD70AE800FC07DA /* H264+AVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "H264+AVC.swift"; sourceTree = "<group>"; };
29B8767E1CD70AE800FC07DA /* AVCConfigurationRecord.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AVCConfigurationRecord.swift; sourceTree = "<group>"; };
29B8767F1CD70AE800FC07DA /* NALUnit.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NALUnit.swift; sourceTree = "<group>"; };
29B876801CD70AE800FC07DA /* PacketizedElementaryStream.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PacketizedElementaryStream.swift; sourceTree = "<group>"; };
29B876811CD70AE800FC07DA /* ProgramSpecific.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProgramSpecific.swift; sourceTree = "<group>"; };
@ -673,7 +673,7 @@
BC20DF2B2503747E007BC608 /* HKPictureInPicureControllerPosition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HKPictureInPicureControllerPosition.swift; sourceTree = "<group>"; };
BC20DF33250374EA007BC608 /* HKPictureInPicureController+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HKPictureInPicureController+Extension.swift"; sourceTree = "<group>"; };
BC34DFD125EBB12C005F975A /* Logboard.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Logboard.xcframework; path = Carthage/Build/Logboard.xcframework; sourceTree = "<group>"; };
BC44A1A823D31E92002D4297 /* AudioConverter.AudioBuffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioConverter.AudioBuffer.swift; sourceTree = "<group>"; wrapsLines = 1; };
BC44A1A823D31E92002D4297 /* AudioCodec.AudioBuffer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AudioCodec.AudioBuffer.swift; sourceTree = "<group>"; wrapsLines = 1; };
BC4C9EAE23F2E736004A14F2 /* AudioStreamBasicDescription+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AudioStreamBasicDescription+Extension.swift"; sourceTree = "<group>"; };
BC4DAEB02479851D005EFD57 /* FilenameUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilenameUtil.swift; sourceTree = "<group>"; };
BC4DAEB424798ABE005EFD57 /* FilenameUtilTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FilenameUtilTests.swift; sourceTree = "<group>"; };
@ -772,9 +772,9 @@
290907CD1C3961AD00F2E80C /* Codec */ = {
isa = PBXGroup;
children = (
BC44A1A823D31E92002D4297 /* AudioConverter.AudioBuffer.swift */,
297E69112324E38800D418AB /* AudioConverter.Destination.swift */,
29B876571CD70A7900FC07DA /* AudioConverter.swift */,
BC44A1A823D31E92002D4297 /* AudioCodec.AudioBuffer.swift */,
297E69112324E38800D418AB /* AudioCodec.Destination.swift */,
29B876571CD70A7900FC07DA /* AudioCodec.swift */,
29B876581CD70A7900FC07DA /* H264Decoder.swift */,
29B876591CD70A7900FC07DA /* H264Encoder.swift */,
29FD1B4F22FF13190095A0BE /* VTSessionPropertyKey.swift */,
@ -955,7 +955,7 @@
isa = PBXGroup;
children = (
29B8767D1CD70AE800FC07DA /* AudioSpecificConfig.swift */,
29B8767E1CD70AE800FC07DA /* H264+AVC.swift */,
29B8767E1CD70AE800FC07DA /* AVCConfigurationRecord.swift */,
29798E511CE5DF1900F5CBD0 /* MP4Reader.swift */,
292D8A321D8B293300DBECE2 /* MP4Sampler.swift */,
29B8767F1CD70AE800FC07DA /* NALUnit.swift */,
@ -1624,12 +1624,12 @@
294B2D3223785E3800CE7BDC /* CircularBuffer.swift in Sources */,
2958910E1EEB8D3C00CE51E1 /* FLVVideoCodec.swift in Sources */,
299B13271D3B751400A1E8F5 /* HKView.swift in Sources */,
BC44A1A923D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */,
BC44A1A923D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */,
BC20DF38250377A3007BC608 /* ScreenCaptureSession.swift in Sources */,
2926A9EC1DE6B71E0074E3D2 /* MachUtil.swift in Sources */,
29B876AF1CD70B2800FC07DA /* RTMPChunk.swift in Sources */,
29D3D4CF1ED04C4C00DD4AA6 /* VideoIOComponent+Extension.swift in Sources */,
29B876841CD70AE800FC07DA /* H264+AVC.swift in Sources */,
29B876841CD70AE800FC07DA /* AVCConfigurationRecord.swift in Sources */,
296242621D8DB86500C451A3 /* TSWriter.swift in Sources */,
BC9CFA9323BDE8B700917EEF /* NetStreamRenderer.swift in Sources */,
29B8769B1CD70B1100FC07DA /* MIME.swift in Sources */,
@ -1660,9 +1660,9 @@
29EA87E61E79A2780043A5F8 /* CMAudioFormatDescription+Extension.swift in Sources */,
29B876B51CD70B2800FC07DA /* RTMPSocket.swift in Sources */,
29B876AB1CD70B2800FC07DA /* AMF0Serializer.swift in Sources */,
29B8765B1CD70A7900FC07DA /* AudioConverter.swift in Sources */,
29B8765B1CD70A7900FC07DA /* AudioCodec.swift in Sources */,
29EA87D51E799F670043A5F8 /* Mirror+Extension.swift in Sources */,
297E69122324E38800D418AB /* AudioConverter.Destination.swift in Sources */,
297E69122324E38800D418AB /* AudioCodec.Destination.swift in Sources */,
2942A4F821A9418A004E1BEE /* Running.swift in Sources */,
29F6F4851DFB83E200920A3A /* RTMPHandshake.swift in Sources */,
29EA87DF1E79A0810043A5F8 /* CMSampleBuffer+Extension.swift in Sources */,
@ -1741,7 +1741,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
29B876EC1CD70D5900FC07DA /* AudioConverter.swift in Sources */,
29B876EC1CD70D5900FC07DA /* AudioCodec.swift in Sources */,
29B876ED1CD70D5900FC07DA /* H264Decoder.swift in Sources */,
BC8E32E42532F3700087DF49 /* GLHKView.swift in Sources */,
29B876EE1CD70D5900FC07DA /* H264Encoder.swift in Sources */,
@ -1767,7 +1767,7 @@
29D3D4D31ED04D9600DD4AA6 /* NetStream+Extension-macOS.swift in Sources */,
29EA87D61E799F6A0043A5F8 /* Mirror+Extension.swift in Sources */,
BC7A23F525171C8F0089F77C /* MTHKView.swift in Sources */,
297E69132324E38800D418AB /* AudioConverter.Destination.swift in Sources */,
297E69132324E38800D418AB /* AudioCodec.Destination.swift in Sources */,
29B876F81CD70D5900FC07DA /* HTTPService.swift in Sources */,
29B876F91CD70D5900FC07DA /* HTTPStream.swift in Sources */,
296543631D62FE9000734698 /* HKView-macOS.swift in Sources */,
@ -1779,7 +1779,7 @@
BC9CFA9423BDE8B700917EEF /* NetStreamRenderer.swift in Sources */,
BC20DF31250374A7007BC608 /* HKPictureInPicureController.swift in Sources */,
296242631D8DBA8C00C451A3 /* TSReader.swift in Sources */,
29B876FE1CD70D5A00FC07DA /* H264+AVC.swift in Sources */,
29B876FE1CD70D5A00FC07DA /* AVCConfigurationRecord.swift in Sources */,
295891171EEB8DFC00CE51E1 /* FLVTagType.swift in Sources */,
294852571D852499002DE492 /* RTMPTSocket.swift in Sources */,
BC83A4742403D83B006BDE06 /* VTCompressionSession+Extension.swift in Sources */,
@ -1800,7 +1800,7 @@
2992D1541ED04A2C008D9DC1 /* VideoIOComponent+Extension-macOS.swift in Sources */,
2926A9EF1DE6B83F0074E3D2 /* MachUtil.swift in Sources */,
2976A47F1D48FD6900B53EF2 /* AVRecorder.swift in Sources */,
BC44A1AA23D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */,
BC44A1AA23D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */,
29B877071CD70D5A00FC07DA /* SoundTransform.swift in Sources */,
29B877081CD70D5A00FC07DA /* VideoIOComponent.swift in Sources */,
294CC9B422D9BEC000F9DD5C /* DisplayLink-macOS.swift in Sources */,
@ -1902,7 +1902,7 @@
29EB3E351ED05A33001CAE8B /* DeviceUtil.swift in Sources */,
29DC17B521D0CC0600E26CED /* Atomic.swift in Sources */,
BC8E32E92532F3710087DF49 /* GLHKView.swift in Sources */,
BC44A1AB23D31E92002D4297 /* AudioConverter.AudioBuffer.swift in Sources */,
BC44A1AB23D31E92002D4297 /* AudioCodec.AudioBuffer.swift in Sources */,
29EB3E261ED05A07001CAE8B /* RTMPStream.swift in Sources */,
29DF20642312A3DD004057C3 /* RTMPNWSocket.swift in Sources */,
29EB3E111ED05881001CAE8B /* IOComponent.swift in Sources */,
@ -1928,12 +1928,12 @@
2941746D22D069B300A2944F /* AudioEffect.swift in Sources */,
29EB3E151ED0588C001CAE8B /* VideoEffect.swift in Sources */,
29EB3E061ED05865001CAE8B /* MP4Sampler.swift in Sources */,
29EB3E041ED05860001CAE8B /* H264+AVC.swift in Sources */,
29EB3E041ED05860001CAE8B /* AVCConfigurationRecord.swift in Sources */,
29EB3DEF1ED05766001CAE8B /* H264Decoder.swift in Sources */,
29EB3DF71ED05797001CAE8B /* URL+Extension.swift in Sources */,
29DF20682312A436004057C3 /* RTMPSocketCompatible.swift in Sources */,
29EB3E0B1ED05871001CAE8B /* TSReader.swift in Sources */,
297E69142324E38800D418AB /* AudioConverter.Destination.swift in Sources */,
297E69142324E38800D418AB /* AudioCodec.Destination.swift in Sources */,
29EB3DF51ED05779001CAE8B /* CMFormatDescription+Extension.swift in Sources */,
29EB3E381ED05A41001CAE8B /* MD5.swift in Sources */,
29EB3E271ED05A09001CAE8B /* RTMPStreamDelegate.swift in Sources */,
@ -1949,7 +1949,7 @@
29EB3E251ED05A04001CAE8B /* RTMPSocket.swift in Sources */,
29EB3E311ED05A29001CAE8B /* AnyUtil.swift in Sources */,
29EB3E1C1ED058A2001CAE8B /* AMF3Serializer.swift in Sources */,
29EB3DEE1ED05763001CAE8B /* AudioConverter.swift in Sources */,
29EB3DEE1ED05763001CAE8B /* AudioCodec.swift in Sources */,
29EB3E241ED05A02001CAE8B /* RTMPSharedObject.swift in Sources */,
29EB3E231ED059FF001CAE8B /* RTMPMuxer.swift in Sources */,
29EB3DF11ED0576C001CAE8B /* Constants.swift in Sources */,

4
Sources/Codec/AudioConverter.AudioBuffer.swift → Sources/Codec/AudioCodec.AudioBuffer.swift
View File

@ -1,7 +1,7 @@
import AVFoundation
import Foundation
extension AudioConverter {
extension AudioCodec {
final class AudioBuffer {
// swiftlint:disable nesting
enum Error: Swift.Error {
@ -121,7 +121,7 @@ extension AudioConverter {
}
}
extension AudioConverter.AudioBuffer: CustomDebugStringConvertible {
extension AudioCodec.AudioBuffer: CustomDebugStringConvertible {
// MARK: CustomDebugStringConvertible
var debugDescription: String {
Mirror(reflecting: self).debugDescription

2
Sources/Codec/AudioConverter.Destination.swift → Sources/Codec/AudioCodec.Destination.swift
View File

@ -1,6 +1,6 @@
import AudioToolbox
extension AudioConverter {
extension AudioCodec {
public enum Destination {
case aac
case pcm

42
Sources/Codec/AudioConverter.swift → Sources/Codec/AudioCodec.swift
View File

@ -1,6 +1,6 @@
import AVFoundation
public protocol AudioConverterDelegate: AnyObject {
public protocol AudioCodecDelegate: AnyObject {
func didSetFormatDescription(audio formatDescription: CMFormatDescription?)
func sampleOutput(audio data: UnsafeMutableAudioBufferListPointer, presentationTimeStamp: CMTime)
}
@ -10,7 +10,7 @@ public protocol AudioConverterDelegate: AnyObject {
- seealse:
- https://developer.apple.com/library/ios/technotes/tn2236/_index.html
*/
public class AudioConverter {
public class AudioCodec {
enum Error: Swift.Error {
case setPropertyError(id: AudioConverterPropertyID, status: OSStatus)
}
@ -24,13 +24,13 @@ public class AudioConverter {
public var keyPath: AnyKeyPath {
switch self {
case .muted:
return \AudioConverter.muted
return \AudioCodec.muted
case .bitrate:
return \AudioConverter.bitrate
return \AudioCodec.bitrate
case .sampleRate:
return \AudioConverter.sampleRate
return \AudioCodec.sampleRate
case .actualBitrate:
return \AudioConverter.actualBitrate
return \AudioCodec.actualBitrate
}
}
}
@ -44,9 +44,9 @@ public class AudioConverter {
public static let defaultMaximumBuffers: Int = 1
public var destination: Destination = .aac
public weak var delegate: AudioConverterDelegate?
public weak var delegate: AudioCodecDelegate?
public private(set) var isRunning: Atomic<Bool> = .init(false)
public var settings: Setting<AudioConverter, Option> = [:] {
public var settings: Setting<AudioCodec, Option> = [:] {
didSet {
settings.observer = self
}
@ -54,7 +54,7 @@ public class AudioConverter {
private static let numSamples: Int = 1024
var muted = false
var bitrate: UInt32 = AudioConverter.defaultBitrate {
var bitrate: UInt32 = AudioCodec.defaultBitrate {
didSet {
guard bitrate != oldValue else {
return
@ -66,13 +66,13 @@ public class AudioConverter {
}
}
}
var sampleRate: Double = AudioConverter.defaultSampleRate
var actualBitrate: UInt32 = AudioConverter.defaultBitrate {
var sampleRate: Double = AudioCodec.defaultSampleRate
var actualBitrate: UInt32 = AudioCodec.defaultBitrate {
didSet {
logger.info(actualBitrate)
}
}
var channels: UInt32 = AudioConverter.defaultChannels
var channels: UInt32 = AudioCodec.defaultChannels
var formatDescription: CMFormatDescription? {
didSet {
guard !CMFormatDescriptionEqual(formatDescription, otherFormatDescription: oldValue) else {
@ -93,13 +93,13 @@ public class AudioConverter {
_inDestinationFormat = nil
logger.info("\(String(describing: inSourceFormat))")
let nonInterleaved = inSourceFormat.mFormatFlags & kAudioFormatFlagIsNonInterleaved != 0
maximumBuffers = nonInterleaved ? Int(inSourceFormat.mChannelsPerFrame) : AudioConverter.defaultMaximumBuffers
currentAudioBuffer = AudioBuffer(inSourceFormat, numSamples: AudioConverter.numSamples)
maximumBuffers = nonInterleaved ? Int(inSourceFormat.mChannelsPerFrame) : AudioCodec.defaultMaximumBuffers
currentAudioBuffer = AudioBuffer(inSourceFormat, numSamples: AudioCodec.numSamples)
}
}
var effects: Set<AudioEffect> = []
private let numSamples = AudioConverter.numSamples
private var maximumBuffers: Int = AudioConverter.defaultMaximumBuffers
private let numSamples = AudioCodec.numSamples
private var maximumBuffers: Int = AudioCodec.defaultMaximumBuffers
private var currentAudioBuffer = AudioBuffer(AudioStreamBasicDescription(mSampleRate: 0, mFormatID: 0, mFormatFlags: 0, mBytesPerPacket: 0, mFramesPerPacket: 0, mBytesPerFrame: 0, mChannelsPerFrame: 1, mBitsPerChannel: 0, mReserved: 0))
private var _inDestinationFormat: AudioStreamBasicDescription?
private var inDestinationFormat: AudioStreamBasicDescription {
@ -132,7 +132,7 @@ public class AudioConverter {
private var audioStreamPacketDescriptionPointer: UnsafeMutablePointer<AudioStreamPacketDescription>?
private let inputDataProc: AudioConverterComplexInputDataProc = {(_: AudioConverterRef, ioNumberDataPackets: UnsafeMutablePointer<UInt32>, ioData: UnsafeMutablePointer<AudioBufferList>, outDataPacketDescription: UnsafeMutablePointer<UnsafeMutablePointer<AudioStreamPacketDescription>?>?, inUserData: UnsafeMutableRawPointer?) in
Unmanaged<AudioConverter>.fromOpaque(inUserData!).takeUnretainedValue().onInputDataForAudioConverter(
Unmanaged<AudioCodec>.fromOpaque(inUserData!).takeUnretainedValue().onInputDataForAudioConverter(
ioNumberDataPackets,
ioData: ioData,
outDataPacketDescription: outDataPacketDescription
@ -287,10 +287,10 @@ public class AudioConverter {
try setProperty(id: kAudioConverterEncodeBitRate, data: bitrate * inDestinationFormat.mChannelsPerFrame)
actualBitrate = bitrate
} catch {
if AudioConverter.minimumBitrate < bitrate {
setBitrateUntilNoErr(bitrate - AudioConverter.minimumBitrate)
if Self.minimumBitrate < bitrate {
setBitrateUntilNoErr(bitrate - Self.minimumBitrate)
} else {
actualBitrate = AudioConverter.minimumBitrate
actualBitrate = Self.minimumBitrate
}
}
}
@ -308,7 +308,7 @@ public class AudioConverter {
}
}
extension AudioConverter: Running {
extension AudioCodec: Running {
// MARK: Running
public func startRunning() {
lockQueue.async {

0
Sources/ISO/H264+AVC.swift → Sources/ISO/AVCConfigurationRecord.swift
View File

4
Sources/ISO/TSWriter.swift
View File

@ -208,8 +208,8 @@ public class TSWriter: Running {
}
}
extension TSWriter: AudioConverterDelegate {
// MARK: AudioConverterDelegate
extension TSWriter: AudioCodecDelegate {
// MARK: AudioCodecDelegate
public func didSetFormatDescription(audio formatDescription: CMFormatDescription?) {
guard let formatDescription: CMAudioFormatDescription = formatDescription else {
return

2
Sources/Media/AVMixer.swift
View File

@ -175,7 +175,7 @@ extension AVMixer {
public func startEncoding(delegate: Any) {
videoIO.encoder.delegate = delegate as? VideoEncoderDelegate
videoIO.encoder.startRunning()
audioIO.encoder.delegate = delegate as? AudioConverterDelegate
audioIO.encoder.delegate = delegate as? AudioCodecDelegate
audioIO.encoder.startRunning()
}

4
Sources/Media/AudioIOComponent.swift
View File

@ -5,7 +5,7 @@ import SwiftPMSupport
#endif
final class AudioIOComponent: IOComponent, DisplayLinkedQueueClockReference {
lazy var encoder = AudioConverter()
lazy var encoder = AudioCodec()
let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AudioIOComponent.lock")
var audioEngine: AVAudioEngine?
@ -176,7 +176,7 @@ extension AudioIOComponent: AVCaptureAudioDataOutputSampleBufferDelegate {
}
}
extension AudioIOComponent: AudioConverterDelegate {
extension AudioIOComponent: AudioCodecDelegate {
// MARK: AudioConverterDelegate
func didSetFormatDescription(audio formatDescription: CMFormatDescription?) {
guard let formatDescription = formatDescription else {

2
Sources/Net/NetStream.swift
View File

@ -37,7 +37,7 @@ open class NetStream: NSObject {
#endif
/// Specify stream audio compression properties.
open var audioSettings: Setting<AudioConverter, AudioConverter.Option> {
open var audioSettings: Setting<AudioCodec, AudioCodec.Option> {
get { mixer.audioIO.encoder.settings }
set { mixer.audioIO.encoder.settings = newValue }
}

4
Sources/RTMP/RTMPMuxer.swift
View File

@ -22,8 +22,8 @@ final class RTMPMuxer {
}
}
extension RTMPMuxer: AudioConverterDelegate {
// MARK: AudioConverterDelegate
extension RTMPMuxer: AudioCodecDelegate {
// MARK: AudioCodecDelegate
func didSetFormatDescription(audio formatDescription: CMFormatDescription?) {
guard let formatDescription = formatDescription else {
return

2
Sources/RTMP/RTMPStream.swift
View File

@ -185,7 +185,7 @@ open class RTMPStream: NetStream {
}
static let defaultID: UInt32 = 0
public static let defaultAudioBitrate: UInt32 = AudioConverter.defaultBitrate
public static let defaultAudioBitrate: UInt32 = AudioCodec.defaultBitrate
public static let defaultVideoBitrate: UInt32 = H264Encoder.defaultBitrate
open weak var delegate: RTMPStreamDelegate?

20
Tests/Codec/AudioConverterTests.swift
View File

@ -6,7 +6,7 @@ import AVFoundation
final class AudioConverterTests: XCTestCase {
func testEncoderCMSampleBuffer44100_1024() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.startRunning()
for _ in 0..<10 {
if let sampleBuffer: CMSampleBuffer = SinWaveUtil.createCMSampleBuffer(44100, numSamples: 1024) {
@ -16,7 +16,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer48000_1024() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.startRunning()
for _ in 0..<10 {
if let sampleBuffer: CMSampleBuffer = SinWaveUtil.createCMSampleBuffer(48000.0, numSamples: 1024) {
@ -26,7 +26,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer24000_1024() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.startRunning()
for _ in 0..<10 {
if let sampleBuffer: CMSampleBuffer = SinWaveUtil.createCMSampleBuffer(24000.0, numSamples: 1024) {
@ -36,7 +36,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer16000_1024() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.startRunning()
for _ in 0..<10 {
if let sampleBuffer: CMSampleBuffer = SinWaveUtil.createCMSampleBuffer(16000.0, numSamples: 1024) {
@ -46,7 +46,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer8000_256() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.delegate = self
encoder.startRunning()
for _ in 0..<10 {
@ -57,7 +57,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer8000_960() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.delegate = self
encoder.startRunning()
for _ in 0..<10 {
@ -68,7 +68,7 @@ final class AudioConverterTests: XCTestCase {
}
func testEncoderCMSampleBuffer8000_1224() {
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.delegate = self
encoder.startRunning()
for _ in 0..<10 {
@ -80,7 +80,7 @@ final class AudioConverterTests: XCTestCase {
func testEncoderCMSampleBuffer8000_numSamples() {
let numSamples: [Int] = [1024, 1024, 1028, 1024, 1028, 1028, 962, 962, 960, 2237, 2236]
let encoder: AudioConverter = AudioConverter()
let encoder = AudioCodec()
encoder.delegate = self
encoder.startRunning()
for numSample in numSamples {
@ -91,8 +91,8 @@ final class AudioConverterTests: XCTestCase {
}
}
extension AudioConverterTests: AudioConverterDelegate {
// MARK: AudioConverterDelegate
extension AudioConverterTests: AudioCodecDelegate {
// MARK: AudioCodec
func sampleOutput(audio data: UnsafeMutableAudioBufferListPointer, presentationTimeStamp: CMTime) {
}