Skip to content

add a optional contentMode param for resizePixelBuffer #49

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add a optional contentMode param for resizePixelBuffer #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ae190c
add a optional contentMode param for resizePixelBuffer
luca992 Jan 7, 2022
3f7ed93
Update CVPixelBuffer+Resize.swift
luca992 Jan 9, 2022
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
59 changes: 48 additions & 11 deletions CoreMLHelpers/CVPixelBuffer+Resize.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import Foundation
import Accelerate
import CoreImage
import SwiftUI

/**
First crops the pixel buffer, then resizes it.
Expand All @@ -38,7 +39,8 @@ public func resizePixelBuffer(from srcPixelBuffer: CVPixelBuffer,
cropWidth: Int,
cropHeight: Int,
scaleWidth: Int,
scaleHeight: Int) {
scaleHeight: Int,
contentMode: ContentMode) {

assert(CVPixelBufferGetWidth(dstPixelBuffer) >= scaleWidth)
assert(CVPixelBufferGetHeight(dstPixelBuffer) >= scaleHeight)
Expand Down Expand Up @@ -72,10 +74,40 @@ public func resizePixelBuffer(from srcPixelBuffer: CVPixelBuffer,
rowBytes: srcBytesPerRow)

let dstBytesPerRow = CVPixelBufferGetBytesPerRow(dstPixelBuffer)
var dstBuffer = vImage_Buffer(data: dstData,
height: vImagePixelCount(scaleHeight),
width: vImagePixelCount(scaleWidth),
rowBytes: dstBytesPerRow)
var dstBuffer : vImage_Buffer
if contentMode == .fit {
let dstBytesPerRow = CVPixelBufferGetBytesPerRow(dstPixelBuffer)

let fitWidth = cropWidth > cropHeight
let startX: Int
let startY: Int
let fittedHeight: Int
let fittedWidth: Int
if fitWidth {
let fitScale = Float(scaleWidth) / Float(cropWidth)
fittedHeight = Int(Float(cropHeight) * fitScale)
fittedWidth = scaleWidth
startX = 0
startY = Int(Float(scaleHeight - fittedHeight) / 2.0)
} else {
let fitScale = Float(scaleHeight) / Float(cropHeight)
fittedHeight = scaleHeight
fittedWidth = Int(Float(cropWidth) * fitScale)
startX = Int(Float(scaleWidth - fittedWidth) / 2.0)
startY = 0
}
let offset = startY * dstBytesPerRow + startX * 4

dstBuffer = vImage_Buffer(data: dstData + offset,
height: vImagePixelCount(fittedHeight),
width: vImagePixelCount(fittedWidth),
rowBytes: dstBytesPerRow)
} else {
dstBuffer = vImage_Buffer(data: dstData,
height: vImagePixelCount(scaleHeight),
width: vImagePixelCount(scaleWidth),
rowBytes: dstBytesPerRow)
}

let error = vImageScale_ARGB8888(&srcBuffer, &dstBuffer, nil, vImage_Flags(0))
if error != kvImageNoError {
Expand All @@ -94,7 +126,8 @@ public func resizePixelBuffer(_ srcPixelBuffer: CVPixelBuffer,
cropWidth: Int,
cropHeight: Int,
scaleWidth: Int,
scaleHeight: Int) -> CVPixelBuffer? {
scaleHeight: Int,
contentMode: ContentMode) -> CVPixelBuffer? {

let pixelFormat = CVPixelBufferGetPixelFormatType(srcPixelBuffer)
let dstPixelBuffer = createPixelBuffer(width: scaleWidth, height: scaleHeight,
Expand All @@ -106,7 +139,8 @@ public func resizePixelBuffer(_ srcPixelBuffer: CVPixelBuffer,
resizePixelBuffer(from: srcPixelBuffer, to: dstPixelBuffer,
cropX: cropX, cropY: cropY,
cropWidth: cropWidth, cropHeight: cropHeight,
scaleWidth: scaleWidth, scaleHeight: scaleHeight)
scaleWidth: scaleWidth, scaleHeight: scaleHeight,
contentMode: contentMode)
}

return dstPixelBuffer
Expand All @@ -121,12 +155,13 @@ public func resizePixelBuffer(_ srcPixelBuffer: CVPixelBuffer,
*/
public func resizePixelBuffer(from srcPixelBuffer: CVPixelBuffer,
to dstPixelBuffer: CVPixelBuffer,
width: Int, height: Int) {
width: Int, height: Int, contentMode: ContentMode) {
resizePixelBuffer(from: srcPixelBuffer, to: dstPixelBuffer,
cropX: 0, cropY: 0,
cropWidth: CVPixelBufferGetWidth(srcPixelBuffer),
cropHeight: CVPixelBufferGetHeight(srcPixelBuffer),
scaleWidth: width, scaleHeight: height)
scaleWidth: width, scaleHeight: height,
contentMode: contentMode)
}

/**
Expand All @@ -135,11 +170,13 @@ public func resizePixelBuffer(from srcPixelBuffer: CVPixelBuffer,
This allocates a new destination pixel buffer that is Metal-compatible.
*/
public func resizePixelBuffer(_ pixelBuffer: CVPixelBuffer,
width: Int, height: Int) -> CVPixelBuffer? {
width: Int, height: Int,
contentMode: ContentMode = .fill) -> CVPixelBuffer? {
return resizePixelBuffer(pixelBuffer, cropX: 0, cropY: 0,
cropWidth: CVPixelBufferGetWidth(pixelBuffer),
cropHeight: CVPixelBufferGetHeight(pixelBuffer),
scaleWidth: width, scaleHeight: height)
scaleWidth: width, scaleHeight: height,
contentMode: contentMode)
}

/**
Expand Down