H.265 codec (#746)

Co-authored-by: Błażej Pankowski <[email protected]>

Author: hiroshihorie

.changes/hevc-codec

@@ -0,0 +1 @@
+minor type="added" "HEVC (H.265) codec support"

LiveKitClient.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |spec|
 
   spec.source_files = "Sources/**/*"
 
-  spec.dependency("LiveKitWebRTC", "= 137.7151.02")
+  spec.dependency("LiveKitWebRTC", "= 137.7151.03")
   spec.dependency("SwiftProtobuf")
   spec.dependency("Logging", "= 1.5.4")
   spec.dependency("DequeModule", "= 1.1.4")

Package.swift

@@ -19,7 +19,7 @@ let package = Package(
     ],
     dependencies: [
         // LK-Prefixed Dynamic WebRTC XCFramework
-        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "137.7151.02"),
+        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "137.7151.03"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.29.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.2"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),

[email protected]

@@ -20,7 +20,7 @@ let package = Package(
     ],
     dependencies: [
         // LK-Prefixed Dynamic WebRTC XCFramework
-        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "137.7151.02"),
+        .package(url: "https://github.com/livekit/webrtc-xcframework.git", exact: "137.7151.03"),
         .package(url: "https://github.com/apple/swift-protobuf.git", from: "1.29.0"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.2"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),

Sources/LiveKit/Core/RTC.swift

@@ -22,7 +22,7 @@ private extension Array where Element: LKRTCVideoCodecInfo {
     func rewriteCodecsIfNeeded() -> [LKRTCVideoCodecInfo] {
         // rewrite H264's profileLevelId to 42e032
         let codecs = map { $0.name == kLKRTCVideoCodecH264Name ? RTC.h264BaselineLevel5CodecInfo : $0 }
-        // logger.log("supportedCodecs: \(codecs.map({ "\($0.name) - \($0.parameters)" }).joined(separator: ", "))", type: Engine.self)
+        // logger.log("supportedCodecs: \(codecs.map({ "\($0.name) - \($0.parameters)" }).joined(separator: ", "))", type: RTC.self)
         return codecs
     }
 }
@@ -70,14 +70,14 @@ actor RTC {
 
     // global properties are already lazy
 
-    private static let encoderFactory: LKRTCVideoEncoderFactory & Sendable = {
+    static let encoderFactory: LKRTCVideoEncoderFactory & Sendable = {
         let encoderFactory = VideoEncoderFactory()
         return VideoEncoderFactorySimulcast(primary: encoderFactory,
                                             fallback: encoderFactory)
 
     }()
 
-    private static let decoderFactory: LKRTCVideoDecoderFactory & Sendable = VideoDecoderFactory()
+    static let decoderFactory: LKRTCVideoDecoderFactory & Sendable = VideoDecoderFactory()
 
     static let audioProcessingModule: LKRTCDefaultAudioProcessingModule = .init()
 

Sources/LiveKit/Types/Codec/VideoCodec.swift

@@ -33,8 +33,9 @@ public final class VideoCodec: NSObject, Codec {
     public static let vp8 = VideoCodec(name: "vp8", isBackup: true)
     public static let vp9 = VideoCodec(name: "vp9", isSVC: true)
     public static let av1 = VideoCodec(name: "av1", isSVC: true)
+    public static let h265 = VideoCodec(name: "h265", isBackup: false)
 
-    public static let all: [VideoCodec] = [.h264, .vp8, .vp9, .av1]
+    public static let all: [VideoCodec] = [.h264, .h265, .vp8, .vp9, .av1]
     public static let allBackup: [VideoCodec] = [.h264, .vp8]
 
     public let mediaType = "video"

Tests/LiveKitTests/CodecTests.swift

@@ -29,7 +29,31 @@ class CodecTests: LKTestCase {
         let h264 = VideoCodec.from(mimeType: "video/h264")
         XCTAssert(h264 == .h264)
 
+        let h265 = VideoCodec.from(mimeType: "video/h265")
+        XCTAssert(h265 == .h265)
+
         let av1 = VideoCodec.from(mimeType: "video/av1")
         XCTAssert(av1 == .av1)
     }
+
+    func testSupportedCodecs() {
+        let encoderCodecs = RTC.decoderFactory.supportedCodecs()
+        print("encoderCodecs: \(encoderCodecs.map { "\($0.name) - \($0.parameters)" }.joined(separator: ", "))")
+        let decoderCodecs = RTC.decoderFactory.supportedCodecs()
+        print("decoderCodecs: \(decoderCodecs.map { "\($0.name) - \($0.parameters)" }.joined(separator: ", "))")
+
+        // Check encoder codecs
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "VP8" }))
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "VP9" }))
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "AV1" }))
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "H264" }))
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "H265" }))
+
+        // Check decoder codecs
+        XCTAssert(decoderCodecs.contains(where: { $0.name == "VP8" }))
+        XCTAssert(decoderCodecs.contains(where: { $0.name == "VP9" }))
+        XCTAssert(decoderCodecs.contains(where: { $0.name == "AV1" }))
+        XCTAssert(decoderCodecs.contains(where: { $0.name == "H264" }))
+        XCTAssert(encoderCodecs.contains(where: { $0.name == "H265" }))
+    }
 }