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

* removed ":DispatchQueue"

This commit is contained in:
Adam Nemecek 2018-03-12 10:04:57 -07:00
parent 7a655c7639
commit 4dd3cd49b2
17 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Examples/iOS/Screencast/RTMPBroadcaster.swift
View File

@ -15,7 +15,7 @@ public class RTMPBroadcaster: RTMPConnection {
return spliter
}()
private var connecting: Bool = false
private let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.RTMPBroadcaster.lock")
private let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.RTMPBroadcaster.lock")
public override init() {
super.init()

11
Platforms/iOS/LFView.swift
View File

@ -3,7 +3,7 @@ import Foundation
import AVFoundation
open class LFView: UIView {
open static var defaultBackgroundColor: UIColor = UIColor.black
open static var defaultBackgroundColor: UIColor = .black
open override class var layerClass: AnyClass {
return AVCaptureVideoPreviewLayer.self
@ -21,11 +21,10 @@ open class LFView: UIView {
var orientation: AVCaptureVideoOrientation = .portrait {
didSet {
guard let connection: AVCaptureConnection = layer.connection else {
return
}
if connection.isVideoOrientationSupported {
connection.videoOrientation = orientation
layer.connection.map {
$0.isVideoOrientationSupported {
$0.videoOrientation = orientation
}
}
}
}

2
Sources/Codec/AACEncoder.swift
View File

@ -69,7 +69,7 @@ final class AACEncoder: NSObject {
}
}
}
var lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AACEncoder.lock")
var lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AACEncoder.lock")
weak var delegate: AudioEncoderDelegate?
internal(set) var running: Bool = false
private var maximumBuffers: Int = AACEncoder.defaultMaximumBuffers

2
Sources/Codec/H264Encoder.swift
View File

@ -113,7 +113,7 @@ final class H264Encoder: NSObject {
}
var locked: UInt32 = 0
var lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.H264Encoder.lock")
var lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.H264Encoder.lock")
var expectedFPS: Float64 = AVMixer.defaultFPS {
didSet {
guard expectedFPS != oldValue else {

1
Sources/Extension/Mirror+Extension.swift
View File

@ -3,6 +3,7 @@ import Foundation
extension Mirror {
var description: String {
var data: [String] = []
if let superclassMirror: Mirror = superclassMirror {
for child in superclassMirror.children {
guard let label: String = child.label else {

8
Sources/ISO/MP4Sampler.swift
View File

@ -15,9 +15,9 @@ public class MP4Sampler {
private var files: [URL] = []
private var handlers: [URL: Handler?] = [: ]
private let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.MP4Sampler.lock")
private let loopQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.MP4Sampler.loop")
private let operations: OperationQueue = OperationQueue()
private let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.MP4Sampler.lock")
private let loopQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.MP4Sampler.loop")
private let operations = OperationQueue()
private(set) var running: Bool = false
func appendFile(_ file: URL, completionHandler: Handler? = nil) {
@ -31,7 +31,7 @@ public class MP4Sampler {
let reader: MP4Reader = MP4Reader(url: url)
do {
let _: UInt32 = try reader.load()
let _ = try reader.load()
} catch {
logger.warn("")
return

2
Sources/ISO/TSWriter.swift
View File

@ -23,7 +23,7 @@ class TSWriter {
m3u8.mediaList = Array(files[startIndex..<files.count])
return m3u8.description
}
var lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.TSWriter.lock")
var lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.TSWriter.lock")
var segmentMaxCount: Int = TSWriter.defaultSegmentMaxCount
var segmentDuration: Double = TSWriter.defaultSegmentDuration

2
Sources/Media/AVMixerRecorder.swift
View File

@ -33,7 +33,7 @@ open class AVMixerRecorder: NSObject {
open var writerInputs: [AVMediaType: AVAssetWriterInput] = [: ]
open var outputSettings: [AVMediaType: [String: Any]] = AVMixerRecorder.defaultOutputSettings
open var pixelBufferAdaptor: AVAssetWriterInputPixelBufferAdaptor?
open let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AVMixerRecorder.lock")
open let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AVMixerRecorder.lock")
private(set) var running: Bool = false
fileprivate(set) var sourceTime: CMTime = kCMTimeZero

2
Sources/Media/AudioIOComponent.swift
View File

@ -4,7 +4,7 @@ import AVFoundation
final class AudioIOComponent: IOComponent {
lazy var encoder: AACEncoder = AACEncoder()
lazy var playback: AudioStreamPlayback = AudioStreamPlayback()
let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AudioIOComponent.lock")
let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AudioIOComponent.lock")
#if os(iOS) || os(macOS)
var input: AVCaptureDeviceInput? {

2
Sources/Media/AudioStreamPlayback.swift
View File

@ -40,7 +40,7 @@ class AudioStreamPlayback {
}
}
}
let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AudioStreamPlayback.lock")
let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.AudioStreamPlayback.lock")
private var bufferSize: UInt32 = AudioStreamPlayback.defaultBufferSize
private var queue: AudioQueueRef? = nil {
didSet {

2
Sources/Media/SoundSpliter.swift
View File

@ -10,7 +10,7 @@ public class SoundSpliter: NSObject {
static let defaultSampleSize: Int = 1024
public weak var delegate: SoundSpliterDelegate?
private let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.SoundMixer.lock")
private let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.SoundMixer.lock")
private(set) var status: OSStatus = noErr {
didSet {
if status != 0 {

2
Sources/Media/VideoIOComponent.swift
View File

@ -3,7 +3,7 @@ import Foundation
import AVFoundation
final class VideoIOComponent: IOComponent {
let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.VideoIOComponent.lock")
let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.VideoIOComponent.lock")
var context: CIContext?
var drawable: NetStreamDrawable?
var formatDescription: CMVideoFormatDescription? {

4
Sources/Net/NetService.swift
View File

@ -6,8 +6,8 @@ open class NetService: NSObject {
return nil
}
let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetService.lock")
var networkQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetService.network")
let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetService.lock")
var networkQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetService.network")
private(set) var domain: String
private(set) var name: String

4
Sources/Net/NetSocket.swift
View File

@ -15,11 +15,11 @@ public class NetSocket: NSObject {
var inputStream: InputStream?
var outputStream: OutputStream?
var inputQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetSocket.input")
var inputQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetSocket.input")
private var buffer: UnsafeMutablePointer<UInt8>?
private var runloop: RunLoop?
private let outputQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetSocket.output")
private let outputQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetSocket.output")
private var timeoutHandler: (() -> Void)?
@discardableResult

2
Sources/Net/NetStream.swift
View File

@ -15,7 +15,7 @@ protocol NetStreamDrawable: class {
// MARK: -
open class NetStream: NSObject {
public private(set) var mixer: AVMixer = AVMixer()
public let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetStream.lock")
public let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.NetStream.lock")
deinit {
metadata.removeAll()

2
Sources/RTMP/RTMPTSocket.swift
View File

@ -56,7 +56,7 @@ final class RTMPTSocket: NSObject, RTMPSocketCompatible {
private var request: URLRequest!
private var c2packet: Data = Data()
private var handshake: RTMPHandshake = RTMPHandshake()
private let outputQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.RTMPTSocket.output")
private let outputQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.RTMPTSocket.output")
private var connectionID: String?
private var isRequesting: Bool = false
private var outputBuffer: Data = Data()

2
Sources/Util/DisplayLinkedQueue.swift
View File

@ -71,7 +71,7 @@ final class DisplayLinkedQueue: NSObject {
displayLink.add(to: .main, forMode: .commonModes)
}
}
private let lockQueue: DispatchQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.DisplayLinkedQueue.lock")
private let lockQueue = DispatchQueue(label: "com.haishinkit.HaishinKit.DisplayLinkedQueue.lock")
func enqueue(_ buffer: CMSampleBuffer) {
lockQueue.async {