Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug unsupported file format 'public.heic' #538

Merged
merged 3 commits into from
Jan 13, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions Sources/LiveKit/Broadcast/Uploader/SampleUploader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ private enum Constants {

class SampleUploader {
private static var imageContext = CIContext(options: nil)
private static var colorSpace = CGColorSpaceCreateDeviceRGB()

@Atomic private var isReady = false
private var connection: BroadcastUploadSocketConnection
Expand All @@ -37,6 +38,9 @@ class SampleUploader {

private let serialQueue: DispatchQueue

// Configure desired compression quality (0.0 = max compression, 1.0 = least compression)
public let compressionQuality: CGFloat = 1.0

init(connection: BroadcastUploadSocketConnection) {
self.connection = connection
serialQueue = DispatchQueue(label: "io.livekit.broadcast.sampleUploader")
Expand Down Expand Up @@ -115,14 +119,12 @@ private extension SampleUploader {

CVPixelBufferLockBaseAddress(imageBuffer, .readOnly)

let scaleFactor = 1.0
let width = CVPixelBufferGetWidth(imageBuffer) / Int(scaleFactor)
let height = CVPixelBufferGetHeight(imageBuffer) / Int(scaleFactor)
let width = CVPixelBufferGetWidth(imageBuffer)
let height = CVPixelBufferGetHeight(imageBuffer)

let orientation = CMGetAttachment(buffer, key: RPVideoSampleOrientationKey as CFString, attachmentModeOut: nil)?.uintValue ?? 0

let scaleTransform = CGAffineTransform(scaleX: CGFloat(1.0 / scaleFactor), y: CGFloat(1.0 / scaleFactor))
let bufferData = jpegData(from: imageBuffer, scale: scaleTransform)
let bufferData = jpegData(from: imageBuffer)

CVPixelBufferUnlockBaseAddress(imageBuffer, .readOnly)

Expand All @@ -144,16 +146,35 @@ private extension SampleUploader {
return serializedMessage
}

func jpegData(from buffer: CVPixelBuffer, scale scaleTransform: CGAffineTransform) -> Data? {
let image = CIImage(cvPixelBuffer: buffer).transformed(by: scaleTransform)
func jpegData(from buffer: CVPixelBuffer) -> Data? {
let image = CIImage(cvPixelBuffer: buffer)

guard let colorSpace = image.colorSpace else {
return nil
}
if #available(iOS 17.0, *) {
return Self.imageContext.jpegRepresentation(
of: image,
colorSpace: Self.colorSpace,
options: [kCGImageDestinationLossyCompressionQuality as CIImageRepresentationOption: compressionQuality]
)
} else {
// Workaround for "unsupported file format 'public.heic'"
guard let cgImage = Self.imageContext.createCGImage(image, from: image.extent) else {
return nil
}

let options: [CIImageRepresentationOption: Float] = [kCGImageDestinationLossyCompressionQuality as CIImageRepresentationOption: 1.0]
let data = NSMutableData()
guard let imageDestination = CGImageDestinationCreateWithData(data, AVFileType.jpg as CFString, 1, nil) else {
return nil
}

let options: [CFString: Any] = [kCGImageDestinationLossyCompressionQuality: compressionQuality]
CGImageDestinationAddImage(imageDestination, cgImage, options as CFDictionary)

return SampleUploader.imageContext.jpegRepresentation(of: image, colorSpace: colorSpace, options: options)
guard CGImageDestinationFinalize(imageDestination) else {
return nil
}

return data as Data
}
}
}

Expand Down