Skip to content

Commit

Permalink
Bump to up 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
shogo4405 committed Dec 27, 2022
1 parent efc893b commit d4be24c
Show file tree
Hide file tree
Showing 195 changed files with 13,439 additions and 7,648 deletions.
30 changes: 15 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ GEM
artifactory (3.0.15)
atomos (0.1.3)
aws-eventstream (1.2.0)
aws-partitions (1.660.0)
aws-sdk-core (3.167.0)
aws-partitions (1.684.0)
aws-sdk-core (3.168.4)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.5)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.59.0)
aws-sdk-kms (1.61.0)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.117.1)
aws-sdk-s3 (1.117.2)
aws-sdk-core (~> 3, >= 3.165.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
Expand Down Expand Up @@ -86,9 +86,9 @@ GEM
dotenv (2.8.1)
emoji_regex (3.2.3)
escape (0.0.4)
ethon (0.15.0)
ethon (0.16.0)
ffi (>= 1.15.0)
excon (0.94.0)
excon (0.95.0)
faraday (1.10.2)
faraday-em_http (~> 1.0)
faraday-em_synchrony (~> 1.0)
Expand Down Expand Up @@ -161,9 +161,9 @@ GEM
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
google-apis-androidpublisher_v3 (0.31.0)
google-apis-androidpublisher_v3 (0.32.0)
google-apis-core (>= 0.9.1, < 2.a)
google-apis-core (0.9.1)
google-apis-core (0.9.2)
addressable (~> 2.5, >= 2.5.1)
googleauth (>= 0.16.2, < 2.a)
httpclient (>= 2.8.1, < 3.a)
Expand Down Expand Up @@ -215,14 +215,14 @@ GEM
sassc (~> 2.1)
sqlite3 (~> 1.3)
xcinvoke (~> 0.3.0)
jmespath (1.6.1)
json (2.6.2)
jwt (2.5.0)
jmespath (1.6.2)
json (2.6.3)
jwt (2.6.0)
liferaft (0.0.6)
memoist (0.16.2)
mini_magick (4.11.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.0)
mini_portile2 (2.8.1)
minitest (5.16.3)
molinillo (0.8.0)
multi_json (1.15.0)
Expand Down Expand Up @@ -260,7 +260,7 @@ GEM
simctl (1.6.8)
CFPropertyList
naturally
sqlite3 (1.5.2)
sqlite3 (1.5.4)
mini_portile2 (~> 2.8.0)
synx (0.2.1)
clamp (~> 0.6)
Expand Down Expand Up @@ -298,7 +298,7 @@ GEM
rouge (~> 2.0.7)
xcpretty-travis-formatter (1.0.1)
xcpretty (~> 0.2, >= 0.0.7)
zeitwerk (2.6.0)
zeitwerk (2.6.6)

PLATFORMS
ruby
Expand Down
2 changes: 1 addition & 1 deletion HaishinKit.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "HaishinKit"
s.version = "1.3.0"
s.version = "1.4.0"
s.summary = "Camera and Microphone streaming library via RTMP, HLS for iOS, macOS and tvOS."
s.swift_version = "5.7"

Expand Down
12 changes: 6 additions & 6 deletions HaishinKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2876,7 +2876,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
ONLY_ACTIVE_ARCH = YES;
"OTHER_SWIFT_FLAGS[arch=*]" = "-Xfrontend -debug-time-function-bodies";
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
Expand Down Expand Up @@ -2910,7 +2910,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
PRODUCT_NAME = HaishinKit;
PROVISIONING_PROFILE = "";
Expand Down Expand Up @@ -2985,7 +2985,7 @@
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
"OTHER_SWIFT_FLAGS[arch=*]" = "-Xfrontend -debug-time-function-bodies";
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
PRODUCT_NAME = HaishinKit;
Expand Down Expand Up @@ -3017,7 +3017,7 @@
"@loader_path/Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.13;
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
PRODUCT_NAME = HaishinKit;
SDKROOT = macosx;
Expand Down Expand Up @@ -3151,7 +3151,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
PRODUCT_NAME = HaishinKit;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -3187,7 +3187,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.2.6;
MARKETING_VERSION = 1.4.0;
PRODUCT_BUNDLE_IDENTIFIER = com.haishinkit.HaishinKit;
PRODUCT_NAME = HaishinKit;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
10 changes: 7 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ Enterprise Grade APIs for Feeds & Chat. <a href="https://getstream.io/tutorials/
## 🌏 Requirements
|-|iOS|OSX|tvOS|Xcode|Swift|
|:----:|:----:|:----:|:----:|:----:|:----:|
|1.4.0+|11.0+|10.13+|10.2+|14.0+|5.7+|
|1.3.0+|11.0+|10.13+|10.2+|14.0+|5.7+|
|1.2.0+|9.0+|10.11+|10.2+|13.0+|5.5+|

Expand Down Expand Up @@ -107,7 +108,7 @@ source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!

def import_pods
pod 'HaishinKit', '~> 1.3.0
pod 'HaishinKit', '~> 1.4.0
end
target 'Your Target' do
Expand All @@ -117,7 +118,7 @@ end
```
### Carthage
```
github "shogo4405/HaishinKit.swift" ~> 1.3.0
github "shogo4405/HaishinKit.swift" ~> 1.4.0
```
### Swift Package Manager
```
Expand Down Expand Up @@ -239,7 +240,10 @@ rtmpConnection.connect("rtmp://username:password@localhost/appName/instanceName"
### Screen Capture
```swift
// iOS
rtmpStream.attachScreen(ScreenCaptureSession(shared: UIApplication.shared))
let screen = IOUIScreenCaptureUnit(shared: UIApplication.shared)
screen.delegate = rtmpStream
screen.startRunning()
// macOS
rtmpStream.attachScreen(AVCaptureScreenInput(displayID: CGMainDisplayID()))
```
Expand Down
19 changes: 6 additions & 13 deletions Sources/Net/NetStream.swift
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,12 @@ open class NetStream: NSObject {
}
}

/// Specifies the recorder properties.
public var recorderSettings: [AVMediaType: [String: Any]] {
get {
mixer.recorder.outputSettings
}
set {
mixer.recorder.outputSettings = newValue
}
}

deinit {
metadata.removeAll()
}

#if os(iOS) || os(macOS)
/// Attaches the camera object.
/// Attaches the primary camera object.
/// - Warning: This method can't use appendSampleBuffer at the same time.
open func attachCamera(_ device: AVCaptureDevice?, onError: ((_ error: Error) -> Void)? = nil) {
lockQueue.async {
Expand All @@ -167,7 +157,7 @@ open class NetStream: NSObject {
}
}

/// Attaches the video capture object for picture in picture.
/// Attaches the 2ndary camera object for picture in picture.
/// - Warning: This method can't use appendSampleBuffer at the same time.
@available(iOS 13.0, *)
open func attachMultiCamera(_ device: AVCaptureDevice?, onError: ((_ error: Error) -> Void)? = nil) {
Expand All @@ -192,13 +182,15 @@ open class NetStream: NSObject {
}
}

/// Attaches the screen input object.
@available(iOS, unavailable)
open func attachScreen(_ input: AVCaptureScreenInput?) {
lockQueue.async {
self.mixer.videoIO.attachScreen(input)
}
}

/// Returns the IOVideoCaptureUnit by index.
public func videoCapture(for index: Int) -> IOVideoCaptureUnit? {
return mixer.videoIO.lockQueue.sync {
switch index {
Expand Down Expand Up @@ -259,7 +251,8 @@ open class NetStream: NSObject {
}

/// Starts recording.
public func startRecording() {
public func startRecording(_ settings: [AVMediaType: [String: Any]]) {
mixer.recorder.outputSettings = settings
mixer.recorder.startRunning()
}

Expand Down
Loading

0 comments on commit d4be24c

Please sign in to comment.