ShuriZma
/
SameBoy
mirror of https://github.com/LIJI32/SameBoy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the camera using the wrong aspect ratio on some Macs. Fix a bug that caused artifacts on the right and bottom edges of the camera image.

This commit is contained in:
Lior Halphon 2023-01-29 23:19:26 +02:00
parent b032b89457
commit c06e320b95
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cocoa/Document.m
View File

@ -1861,18 +1861,20 @@ static bool is_path_writeable(const char *path)
NSError *error; NSError *error;
AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo]; AVCaptureDevice *device = [AVCaptureDevice defaultDeviceWithMediaType: AVMediaTypeVideo];
AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice: device error: &error]; AVCaptureDeviceInput *input = [AVCaptureDeviceInput deviceInputWithDevice: device error: &error];
CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions([[[device formats] firstObject] formatDescription]); CMVideoDimensions dimensions = CMVideoFormatDescriptionGetDimensions([[[device formats] lastObject] formatDescription]);
if (!input) { if (!input) {
GB_camera_updated(&gb); GB_camera_updated(&gb);
return; return;
} }
double ratio = MAX(130.0 / dimensions.width, 114.0 / dimensions.height);
cameraOutput = [[AVCaptureStillImageOutput alloc] init]; cameraOutput = [[AVCaptureStillImageOutput alloc] init];
/* Greyscale is not widely supported, so we use YUV, whose first element is the brightness. */ /* Greyscale is not widely supported, so we use YUV, whose first element is the brightness. */
[cameraOutput setOutputSettings: @{(id)kCVPixelBufferPixelFormatTypeKey: @(kYUVSPixelFormat), [cameraOutput setOutputSettings: @{(id)kCVPixelBufferPixelFormatTypeKey: @(kYUVSPixelFormat),
(id)kCVPixelBufferWidthKey: @(MAX(128, 112 * dimensions.width / dimensions.height)), (id)kCVPixelBufferWidthKey: @(round(dimensions.width * ratio)),
(id)kCVPixelBufferHeightKey: @(MAX(112, 128 * dimensions.height / dimensions.width)),}]; (id)kCVPixelBufferHeightKey: @(round(dimensions.height * ratio)),}];
cameraSession = [AVCaptureSession new]; cameraSession = [AVCaptureSession new];
@ -1908,7 +1910,7 @@ static bool is_path_writeable(const char *path)
}); });
} }
- (uint8_t)cameraGetPixelAtX:(uint8_t)x andY:(uint8_t) y - (uint8_t)cameraGetPixelAtX:(unsigned)x andY:(unsigned)y
{ {
if (!cameraImage) { if (!cameraImage) {
return 0; return 0;
@ -1916,8 +1918,8 @@ static bool is_path_writeable(const char *path)
uint8_t *baseAddress = (uint8_t *)CVPixelBufferGetBaseAddress(cameraImage); uint8_t *baseAddress = (uint8_t *)CVPixelBufferGetBaseAddress(cameraImage);
size_t bytesPerRow = CVPixelBufferGetBytesPerRow(cameraImage); size_t bytesPerRow = CVPixelBufferGetBytesPerRow(cameraImage);
uint8_t offsetX = (CVPixelBufferGetWidth(cameraImage) - 128) / 2; unsigned offsetX = (CVPixelBufferGetWidth(cameraImage) - 128) / 2;
uint8_t offsetY = (CVPixelBufferGetHeight(cameraImage) - 112) / 2; unsigned offsetY = (CVPixelBufferGetHeight(cameraImage) - 112) / 2;
uint8_t ret = baseAddress[(x + offsetX) * 2 + (y + offsetY) * bytesPerRow]; uint8_t ret = baseAddress[(x + offsetX) * 2 + (y + offsetY) * bytesPerRow];
return ret; return ret;

11
Core/camera.c
View File

@ -25,10 +25,17 @@ static uint8_t generate_noise(uint8_t x, uint8_t y)
static long get_processed_color(GB_gameboy_t *gb, uint8_t x, uint8_t y) static long get_processed_color(GB_gameboy_t *gb, uint8_t x, uint8_t y)
{ {
if (x >= 128) { if (x == 128) {
x = 127;
}
else if (x > 128) {
x = 0; x = 0;
} }
if (y >= 112) {
if (y == 112) {
y = 111;
}
else if (y >= 112) {
y = 0; y = 0;
} }