Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-06-02 07:27:19 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Allow for floating point error in matching framerates

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/10053
This commit is contained in:
Sam Lantinga
2024-07-05 09:23:06 -07:00
parent d5a0f60963
commit 4f71218e17
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/camera/coremedia/SDL_camera_coremedia.m
+12 -7
View File
@@ -268,12 +268,14 @@ static int COREMEDIA_OpenDevice(SDL_CameraDevice *device, const SDL_CameraSpec *
} }
const CMVideoDimensions dim = CMVideoFormatDescriptionGetDimensions(formatDescription); const CMVideoDimensions dim = CMVideoFormatDescriptionGetDimensions(formatDescription);
if ( ((int) dim.width != w) || (((int) dim.height) != h) ) { if ((int)dim.width != w || (int)dim.height != h) {
continue; continue;
} }
const float FRAMERATE_EPSILON = 0.01f;
for (AVFrameRateRange *framerate in format.videoSupportedFrameRateRanges) { for (AVFrameRateRange *framerate in format.videoSupportedFrameRateRanges) {
if (rate >= framerate.minFrameRate && rate <= framerate.maxFrameRate) { if (rate > (framerate.minFrameRate - FRAMERATE_EPSILON) &&
rate < (framerate.maxFrameRate + FRAMERATE_EPSILON)) {
spec_format = format; spec_format = format;
break; break;
} }
@@ -393,12 +395,15 @@ static void GatherCameraSpecs(AVCaptureDevice *device, CameraFormatAddData *add_
const int w = (int) dims.width; const int w = (int) dims.width;
const int h = (int) dims.height; const int h = (int) dims.height;
for (AVFrameRateRange *framerate in fmt.videoSupportedFrameRateRanges) { for (AVFrameRateRange *framerate in fmt.videoSupportedFrameRateRanges) {
int numerator = 0, denominator = 1; int min_numerator = 0, min_denominator = 1;
int max_numerator = 0, max_denominator = 1;
SDL_CalculateFraction(framerate.minFrameRate, &numerator, &denominator); SDL_CalculateFraction(framerate.minFrameRate, &min_numerator, &min_denominator);
SDL_AddCameraFormat(add_data, device_format, device_colorspace, w, h, numerator, denominator); SDL_AddCameraFormat(add_data, device_format, device_colorspace, w, h, min_numerator, min_denominator);
SDL_CalculateFraction(framerate.maxFrameRate, &numerator, &denominator); SDL_CalculateFraction(framerate.maxFrameRate, &max_numerator, &max_denominator);
SDL_AddCameraFormat(add_data, device_format, device_colorspace, w, h, numerator, denominator); if (max_numerator != min_numerator || max_denominator != min_denominator) {
SDL_AddCameraFormat(add_data, device_format, device_colorspace, w, h, max_numerator, max_denominator);
}
} }
} }
} }