add video scaling mode

MetalPetal · Aug 12, 2020 · ebbdb07 · ebbdb07
1 parent 3f1495a
commit ebbdb07
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/Sources/VideoIO/AudioVideoSettings.swift b/Sources/VideoIO/AudioVideoSettings.swift
@@ -15,6 +15,20 @@ extension AVVideoCodecType: Codable {
 
 public struct VideoSettings: Codable {
 
+    public struct ScalingMode: RawRepresentable {
+        public let rawValue: String
+        public init(rawValue: String) {
+            self.rawValue = rawValue
+        }
+        public init(_ value: String) {
+            self.init(rawValue: value)
+        }
+        public static let fit = ScalingMode(AVVideoScalingModeFit)
+        public static let resize = ScalingMode(AVVideoScalingModeResize)
+        public static let resizeAspect = ScalingMode(AVVideoScalingModeResizeAspect)
+        public static let resizeAspectFill = ScalingMode(AVVideoScalingModeResizeAspectFill)
+    }
+
     public struct CompressionProperties: Codable {
         public var averageBitRate: Int?
         public var profileLevel: String?
@@ -66,6 +80,7 @@ public struct VideoSettings: Codable {
     public var width: Int
     public var height: Int
     public var codec: AVVideoCodecType
+    public var scalingMode: ScalingMode?
 
     public var compressionProperties: CompressionProperties?
 
@@ -92,13 +107,15 @@ public struct VideoSettings: Codable {
         public static let height = CodingKeys(AVVideoHeightKey)
         public static let codec = CodingKeys(AVVideoCodecKey)
         public static let compressionProperties = CodingKeys(AVVideoCompressionPropertiesKey)
+        public static let scalingMode = CodingKeys(AVVideoScalingModeKey)
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
         try container.encode(width, forKey: .width)
         try container.encode(height, forKey: .height)
         try container.encode(codec, forKey: .codec)
+        try container.encodeIfPresent(scalingMode?.rawValue, forKey: .scalingMode)
         try container.encodeIfPresent(compressionProperties, forKey: .compressionProperties)
     }
 
@@ -107,6 +124,7 @@ public struct VideoSettings: Codable {
         self.width = try container.decode(Int.self, forKey: .width)
         self.height = try container.decode(Int.self, forKey: .height)
         self.codec = try container.decode(AVVideoCodecType.self, forKey: .codec)
+        self.scalingMode = (try container.decodeIfPresent(String.self, forKey: .scalingMode)).map(ScalingMode.init(rawValue:))
         self.compressionProperties = try container.decodeIfPresent(CompressionProperties.self, forKey: .compressionProperties)
     }
 

diff --git a/Tests/VideoIOTests/VideoIOTests.swift b/Tests/VideoIOTests/VideoIOTests.swift
@@ -29,6 +29,14 @@ final class VideoIOTests: XCTestCase {
                                                                    AVVideoHeightKey: 720,
                                                                    AVVideoCodecKey: "avc1",
                                                                    AVVideoCompressionPropertiesKey: [AVVideoAverageBitRateKey: 3000000, AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel]] as NSDictionary)
+
+        var videoSettings2: VideoSettings = .h264(videoSize: CGSize(width: 1280, height: 720), averageBitRate: 3000000)
+        videoSettings2.scalingMode = .resizeAspectFill
+        XCTAssert(videoSettings2.toDictionary() as NSDictionary == [AVVideoWidthKey: 1280,
+                                                                   AVVideoHeightKey: 720,
+                                                                   AVVideoCodecKey: "avc1",
+                                                                   AVVideoScalingModeKey: AVVideoScalingModeResizeAspectFill,
+                                                                   AVVideoCompressionPropertiesKey: [AVVideoAverageBitRateKey: 3000000, AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel]] as NSDictionary)
     }
 
     func testVideoExport() {