Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[camera] Add front camera mirroring update on iOS #4420

Closed
trK54Ylmz wants to merge 6 commits into from
Closed

[camera] Add front camera mirroring update on iOS #4420

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2fd1c07
Add mirroring correction on bgra8888 format
trK54Ylmz Oct 6, 2021
b50c554
Add mirroring correction on bi-planar 4:2:0 format
trK54Ylmz Oct 8, 2021
7fc558f
Format camera plugin on iOS
trK54Ylmz Oct 8, 2021
b6cadce
Update change log and version
trK54Ylmz Oct 9, 2021
6c01e10
Update version
trK54Ylmz Oct 9, 2021
67e5ec8
Update changes
trK54Ylmz Nov 1, 2021
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
Prev Previous commit
Next Next commit
Format camera plugin on iOS
  • Loading branch information
@trK54Ylmz
trK54Ylmz committed Oct 8, 2021
commit 7fc558f563fa044bd21c0fa9cab266a8f2a66f49
38 changes: 20 additions & 18 deletions packages/camera/camera/ios/Classes/CameraPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ - (void)captureOutput:(AVCaptureOutput *)output

if ([_captureDevice position] == AVCaptureDevicePositionFront) {
CVPixelBufferLockBaseAddress(nextBuffer, kCVPixelBufferLock_ReadOnly);

const Boolean isPlanar = CVPixelBufferIsPlanar(nextBuffer);
size_t planeCount;
if (isPlanar) {
Expand All @@ -724,7 +724,7 @@ - (void)captureOutput:(AVCaptureOutput *)output
size_t height = CVPixelBufferGetHeight(nextBuffer);
size_t width = CVPixelBufferGetWidth(nextBuffer);

void* targetBytes = malloc(height * bytesPerRow);
void *targetBytes = malloc(height * bytesPerRow);
size_t targetBytesPerRow = bytesPerRow;

vImage_Buffer inBuffer;
Expand All @@ -744,7 +744,7 @@ - (void)captureOutput:(AVCaptureOutput *)output
err = vImageHorizontalReflect_ARGB8888(&inBuffer, &outBuffer, kvImageNoFlags);

if (err != kvImageNoError) {
NSLog (@"vImageHorizontalReflect_ARGB8888 returned %ld", err);
NSLog(@"vImageHorizontalReflect_ARGB8888 returned %ld", err);

free(targetBytes);
targetBytes = NULL;
Expand All @@ -755,11 +755,12 @@ - (void)captureOutput:(AVCaptureOutput *)output
CVReturn status;
CVPixelBufferRef nnb = NULL;

status = CVPixelBufferCreateWithBytes(kCFAllocatorDefault, width, height, formatType, outBuffer.data,
outBuffer.rowBytes, NULL, NULL, NULL, &nnb);

status = CVPixelBufferCreateWithBytes(kCFAllocatorDefault, width, height, formatType,
outBuffer.data, outBuffer.rowBytes, NULL, NULL,
NULL, &nnb);

if (status != kCVReturnSuccess) {
NSLog (@"CVPixelBufferCreateWithBytes returned %d", status);
NSLog(@"CVPixelBufferCreateWithBytes returned %d", status);

free(targetBytes);
targetBytes = NULL;
Expand All @@ -774,25 +775,25 @@ - (void)captureOutput:(AVCaptureOutput *)output

CVBufferRelease(nnb);
} else {
uint8_t* planeAddress[planeCount];
uint8_t *planeAddress[planeCount];
size_t bytesPerRow[planeCount];
size_t height[planeCount];
size_t width[planeCount];

uint8_t* targetAddress[planeCount];
uint8_t *targetAddress[planeCount];

for (int i = 0; i < planeCount; i++) {
planeAddress[i] = CVPixelBufferGetBaseAddressOfPlane(nextBuffer, i);
bytesPerRow[i] = CVPixelBufferGetBytesPerRowOfPlane(nextBuffer, i);
height[i] = CVPixelBufferGetHeightOfPlane(nextBuffer, i);
width[i] = CVPixelBufferGetWidthOfPlane(nextBuffer, i);

targetAddress[i] = malloc(height[i] * bytesPerRow[i]);
}

size_t wp;
size_t hp;

uint8_t x = bytesPerRow[1] - (width[1] * 2) - 1;

for (size_t i = 0; i < height[1]; i++) {
Expand All @@ -814,7 +815,7 @@ - (void)captureOutput:(AVCaptureOutput *)output
inBuffer.rowBytes = bytesPerRow[0];
inBuffer.width = width[0];
inBuffer.height = height[0];

vImage_Buffer outBuffer;
outBuffer.data = targetAddress[0];
outBuffer.rowBytes = bytesPerRow[0];
Expand All @@ -826,7 +827,7 @@ - (void)captureOutput:(AVCaptureOutput *)output
err = vImageHorizontalReflect_Planar8(&inBuffer, &outBuffer, kvImageNoFlags);

if (err != kvImageNoError) {
NSLog (@"vImageHorizontalReflect_Planar8 returned %ld", err);
NSLog(@"vImageHorizontalReflect_Planar8 returned %ld", err);

for (int i = 0; i < planeCount; i++) {
free(targetAddress[i]);
Expand All @@ -838,14 +839,15 @@ - (void)captureOutput:(AVCaptureOutput *)output
CVReturn status;
CVPixelBufferRef nnb = NULL;

status = CVPixelBufferCreate(kCFAllocatorDefault, width[0], height[0], formatType, NULL, &nnb);
status =
CVPixelBufferCreate(kCFAllocatorDefault, width[0], height[0], formatType, NULL, &nnb);

if (status != kCVReturnSuccess) {
NSLog (@"CVPixelBufferCreate returned %d", status);
NSLog(@"CVPixelBufferCreate returned %d", status);

return;
}

CVPixelBufferLockBaseAddress(nnb, kCVPixelBufferLock_ReadOnly);
uint8_t *y = CVPixelBufferGetBaseAddressOfPlane(nnb, 0);
memcpy(y, targetAddress[0], height[0] * bytesPerRow[0]);
Expand All @@ -862,7 +864,7 @@ - (void)captureOutput:(AVCaptureOutput *)output

CVBufferRelease(nnb);
}

CVPixelBufferUnlockBaseAddress(nextBuffer, kCVPixelBufferLock_ReadOnly);
} else {
[_videoAdaptor appendPixelBuffer:nextBuffer withPresentationTime:nextSampleTime];
Expand Down