diff --git a/CHANGELOG.md b/CHANGELOG.md index 673c061..ac25a58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# CascableCore 12.4 + +### API Changes + +- Added the `CBLVideoFormatCompressionLevel` enum and `compressionLevel` property to `id `. + +### Bug Fixes + +- Fixed an issue that would cause the `CBLErrorCodeRequiresPhysicalInteraction` error to *not* be thrown when failing to switch to stills mode due to the physical position of the stills/video switch on some Canon camera models. + +- `-setCurrentCommandCategories:completionCallback:` now correctly waits for Canon cameras to switch in/out of the requisite mode before calling the completion handler, matching the documented behaviour. + + # CascableCore 12.3 ### New Property: Video Recording Format diff --git a/CascableCore.xcframework/Info.plist b/CascableCore.xcframework/Info.plist index b1fdb83..640a7b1 100644 --- a/CascableCore.xcframework/Info.plist +++ b/CascableCore.xcframework/Info.plist @@ -6,32 +6,34 @@ LibraryIdentifier - ios-arm64 + ios-arm64_x86_64-simulator LibraryPath CascableCore.framework SupportedArchitectures arm64 + x86_64 SupportedPlatform ios + SupportedPlatformVariant + simulator LibraryIdentifier - macos-arm64_x86_64 + ios-arm64 LibraryPath CascableCore.framework SupportedArchitectures arm64 - x86_64 SupportedPlatform - macos + ios LibraryIdentifier - ios-arm64_x86_64-simulator + macos-arm64_x86_64 LibraryPath CascableCore.framework SupportedArchitectures @@ -40,9 +42,7 @@ x86_64 SupportedPlatform - ios - SupportedPlatformVariant - simulator + macos CFBundlePackageType diff --git a/CascableCore.xcframework/ios-arm64/CascableCore.framework/CascableCore b/CascableCore.xcframework/ios-arm64/CascableCore.framework/CascableCore index ee889ac..591b776 100755 Binary files a/CascableCore.xcframework/ios-arm64/CascableCore.framework/CascableCore and b/CascableCore.xcframework/ios-arm64/CascableCore.framework/CascableCore differ diff --git a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCameraPropertyAPI.h b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCameraPropertyAPI.h index 55984b6..6fa26b0 100644 --- a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCameraPropertyAPI.h +++ b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCameraPropertyAPI.h @@ -347,6 +347,31 @@ NS_SWIFT_NAME(ExposurePropertyValue) @end +/// Values representing the level of video compression for a `CBLVideoFormatPropertyValue` value. In general, +/// higher values have *more* compression (i.e., smaller file sizes). +typedef NS_ENUM(NSInteger, CBLVideoFormatCompressionLevel) { + /// The compression level is unavailable. + CBLVideoFormatCompressionLevelUnknown = 0, + + /// The video is being compressed with a raw codec. + CBLVideoFormatCompressionLevelRaw = 1, + + /// The video is being compressed using a codec that's effectively lossless, such as ProRes. + CBLVideoFormatCompressionLevelEffectivelyLossless = 2, + + /// The video is being compressed using a codec designed for editing. This includes codecs like MJPEG, as well + /// as h264/h265 in ALL-I/XAVC S-I mode. + CBLVideoFormatCompressionLevelForEditing = 3, + + /// The video is being compressed using a codec designed for playback. This includes h264/h265 in Long GOP/IPB/ + /// IPB Standard/XAVC S/XAVC HS mode. + CBLVideoFormatCompressionLevelNormal = 4, + + /// The video is being compressed using a codec designed for smaller file sizes. This includes h264/264 in + /// IPB Light/XAVC L mode. + CBLVideoFormatCompressionLevelHigh = 5 +} NS_SWIFT_NAME(VideoFormatCompressionLevel); + /// A property value that represents a video format description. NS_SWIFT_NAME(VideoFormatPropertyValue) @protocol CBLVideoFormatPropertyValue @@ -357,6 +382,9 @@ NS_SWIFT_NAME(VideoFormatPropertyValue) /// Returns the video format's frame size, in pixels, if available. If not available, returns `CGSizeZero`. @property (nonatomic, readonly) CGSize frameSize; +/// Returns the video format's compression level, if available. If not available, returns `CBLVideoFormatCompressionLevelUnknown`. +@property (nonatomic, readonly) CBLVideoFormatCompressionLevel compressionLevel; + @end // MARK: - Common Values diff --git a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCoreVersions.h b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCoreVersions.h index 4c267ee..f25a3c0 100644 --- a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCoreVersions.h +++ b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Headers/CBLCoreVersions.h @@ -1,4 +1,4 @@ /// Returns a detailed version string for the SDK. -static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.3-gb9c3cba"; +static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.4-ga135934"; /// Returns the build number for the SDK. -static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1661"; +static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1668"; diff --git a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Info.plist b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Info.plist index 1683b25..d51f665 100644 Binary files a/CascableCore.xcframework/ios-arm64/CascableCore.framework/Info.plist and b/CascableCore.xcframework/ios-arm64/CascableCore.framework/Info.plist differ diff --git a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/CascableCore b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/CascableCore index 30643c2..226704a 100755 Binary files a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/CascableCore and b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/CascableCore differ diff --git a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCameraPropertyAPI.h b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCameraPropertyAPI.h index 55984b6..6fa26b0 100644 --- a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCameraPropertyAPI.h +++ b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCameraPropertyAPI.h @@ -347,6 +347,31 @@ NS_SWIFT_NAME(ExposurePropertyValue) @end +/// Values representing the level of video compression for a `CBLVideoFormatPropertyValue` value. In general, +/// higher values have *more* compression (i.e., smaller file sizes). +typedef NS_ENUM(NSInteger, CBLVideoFormatCompressionLevel) { + /// The compression level is unavailable. + CBLVideoFormatCompressionLevelUnknown = 0, + + /// The video is being compressed with a raw codec. + CBLVideoFormatCompressionLevelRaw = 1, + + /// The video is being compressed using a codec that's effectively lossless, such as ProRes. + CBLVideoFormatCompressionLevelEffectivelyLossless = 2, + + /// The video is being compressed using a codec designed for editing. This includes codecs like MJPEG, as well + /// as h264/h265 in ALL-I/XAVC S-I mode. + CBLVideoFormatCompressionLevelForEditing = 3, + + /// The video is being compressed using a codec designed for playback. This includes h264/h265 in Long GOP/IPB/ + /// IPB Standard/XAVC S/XAVC HS mode. + CBLVideoFormatCompressionLevelNormal = 4, + + /// The video is being compressed using a codec designed for smaller file sizes. This includes h264/264 in + /// IPB Light/XAVC L mode. + CBLVideoFormatCompressionLevelHigh = 5 +} NS_SWIFT_NAME(VideoFormatCompressionLevel); + /// A property value that represents a video format description. NS_SWIFT_NAME(VideoFormatPropertyValue) @protocol CBLVideoFormatPropertyValue @@ -357,6 +382,9 @@ NS_SWIFT_NAME(VideoFormatPropertyValue) /// Returns the video format's frame size, in pixels, if available. If not available, returns `CGSizeZero`. @property (nonatomic, readonly) CGSize frameSize; +/// Returns the video format's compression level, if available. If not available, returns `CBLVideoFormatCompressionLevelUnknown`. +@property (nonatomic, readonly) CBLVideoFormatCompressionLevel compressionLevel; + @end // MARK: - Common Values diff --git a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCoreVersions.h b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCoreVersions.h index 4c267ee..f25a3c0 100644 --- a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCoreVersions.h +++ b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Headers/CBLCoreVersions.h @@ -1,4 +1,4 @@ /// Returns a detailed version string for the SDK. -static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.3-gb9c3cba"; +static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.4-ga135934"; /// Returns the build number for the SDK. -static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1661"; +static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1668"; diff --git a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Info.plist b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Info.plist index 51a9681..114a250 100644 Binary files a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Info.plist and b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/Info.plist differ diff --git a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/_CodeSignature/CodeResources b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/_CodeSignature/CodeResources index 582a8bb..df40803 100644 --- a/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/_CodeSignature/CodeResources +++ b/CascableCore.xcframework/ios-arm64_x86_64-simulator/CascableCore.framework/_CodeSignature/CodeResources @@ -306,7 +306,7 @@ Headers/CBLCameraPropertyAPI.h - pasGFktz/tqIvCK1VmBNlcEayPE= + C1I4ZmZhxjz8Tlg94ceasJ1lctY= Headers/CBLCameraQRDecoding.h @@ -322,7 +322,7 @@ Headers/CBLCoreVersions.h - QkVavophcT+Q391niOvjHZ6UhdA= + wlws9Sy/o/OaclL+vlsEM4935hE= Headers/CBLDeviceInfo.h @@ -394,7 +394,7 @@ Info.plist - ymvVcIAmUPN1kcyww0s10tb89Xw= + 5c0Rzefh2qt0OdZAOmpBWy8BK5w= Modules/module.modulemap @@ -1526,7 +1526,7 @@ hash2 - Rcu1ajqjUT68Y4MPuTb9lzKRetHp6teh63zoTqWkMp4= + ExfAPEdhxcKWT50iBsIBxCYFIRMQmpexBl2MIk2Q+fo= Headers/CBLCameraQRDecoding.h @@ -1554,7 +1554,7 @@ hash2 - MBqLtDuKaTUgmjfg/3wktLu1zvVNlVKcw6T5PjxWJDE= + rH9sagiIcPbzILPkcDW2Y5FnLqFgkqc/3y+lu8tFQ5o= Headers/CBLDeviceInfo.h diff --git a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/CascableCore b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/CascableCore index 75042d4..788d6d9 100755 Binary files a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/CascableCore and b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/CascableCore differ diff --git a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCameraPropertyAPI.h b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCameraPropertyAPI.h index 55984b6..6fa26b0 100644 --- a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCameraPropertyAPI.h +++ b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCameraPropertyAPI.h @@ -347,6 +347,31 @@ NS_SWIFT_NAME(ExposurePropertyValue) @end +/// Values representing the level of video compression for a `CBLVideoFormatPropertyValue` value. In general, +/// higher values have *more* compression (i.e., smaller file sizes). +typedef NS_ENUM(NSInteger, CBLVideoFormatCompressionLevel) { + /// The compression level is unavailable. + CBLVideoFormatCompressionLevelUnknown = 0, + + /// The video is being compressed with a raw codec. + CBLVideoFormatCompressionLevelRaw = 1, + + /// The video is being compressed using a codec that's effectively lossless, such as ProRes. + CBLVideoFormatCompressionLevelEffectivelyLossless = 2, + + /// The video is being compressed using a codec designed for editing. This includes codecs like MJPEG, as well + /// as h264/h265 in ALL-I/XAVC S-I mode. + CBLVideoFormatCompressionLevelForEditing = 3, + + /// The video is being compressed using a codec designed for playback. This includes h264/h265 in Long GOP/IPB/ + /// IPB Standard/XAVC S/XAVC HS mode. + CBLVideoFormatCompressionLevelNormal = 4, + + /// The video is being compressed using a codec designed for smaller file sizes. This includes h264/264 in + /// IPB Light/XAVC L mode. + CBLVideoFormatCompressionLevelHigh = 5 +} NS_SWIFT_NAME(VideoFormatCompressionLevel); + /// A property value that represents a video format description. NS_SWIFT_NAME(VideoFormatPropertyValue) @protocol CBLVideoFormatPropertyValue @@ -357,6 +382,9 @@ NS_SWIFT_NAME(VideoFormatPropertyValue) /// Returns the video format's frame size, in pixels, if available. If not available, returns `CGSizeZero`. @property (nonatomic, readonly) CGSize frameSize; +/// Returns the video format's compression level, if available. If not available, returns `CBLVideoFormatCompressionLevelUnknown`. +@property (nonatomic, readonly) CBLVideoFormatCompressionLevel compressionLevel; + @end // MARK: - Common Values diff --git a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCoreVersions.h b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCoreVersions.h index 4c267ee..f25a3c0 100644 --- a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCoreVersions.h +++ b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Headers/CBLCoreVersions.h @@ -1,4 +1,4 @@ /// Returns a detailed version string for the SDK. -static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.3-gb9c3cba"; +static NSString * const CBLCoreVerboseVersion NS_SWIFT_NAME(CascableCoreVerboseVersion) = @"12.4-ga135934"; /// Returns the build number for the SDK. -static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1661"; +static NSString * const CBLCoreBundleVersion NS_SWIFT_NAME(CascableCoreBundleVersion) = @"1668"; diff --git a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Resources/Info.plist b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Resources/Info.plist index 3009611..9f79a7e 100644 Binary files a/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Resources/Info.plist and b/CascableCore.xcframework/macos-arm64_x86_64/CascableCore.framework/Versions/A/Resources/Info.plist differ