diff --git a/CHANGELOG.md b/CHANGELOG.md index 796a8e2fe..b7dc5c55b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,8 @@ Features: * Added support for MagicUI 3.x, which stores a bare version number instead of a `MagicUI_x.y.z` string. * Added Samsung OneUI support (#2541) * This is mostly untested due to lack of available devices running these ROMs. Please report any issues you encounter. +* Improved Camera detection on Android (Camera, Android) + * The camera list is now read from the camera2 NDK instead of `termux-api CameraInfo`, so the Termux:API app is no longer required and no subprocess is spawned. * Improved COSMIC detection (DE / WM, Linux) * The version is now read from the `COSMIC_VERSION` environment variable when it is set. * Improved accuracy and performance of process name detection in the Top module. (Top, macOS) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5affebc3..fda52041c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2003,6 +2003,7 @@ elseif(ANDROID) PRIVATE "m" PRIVATE jnigraphics PRIVATE mediandk + PRIVATE camera2ndk ) if(ENABLE_WORDEXP) # https://github.com/termux/termux-packages/pull/7056 diff --git a/src/detection/camera/camera_android.c b/src/detection/camera/camera_android.c index 9a82668d6..5b3b1ccfd 100644 --- a/src/detection/camera/camera_android.c +++ b/src/detection/camera/camera_android.c @@ -1,58 +1,108 @@ #include "camera.h" -#include "common/processing.h" -#include "common/properties.h" +#include +#include +#include -#define FF_TERMUX_API_PATH FASTFETCH_TARGET_DIR_ROOT "/libexec/termux-api" -#define FF_TERMUX_API_PARAM "CameraInfo" +// HAL_PIXEL_FORMAT_JPEG, the still capture format the stream configurations are keyed by. It is +// defined in , which the NDK does not ship, and shares its value with +// AHardwareBuffer's BLOB format. +#define FF_ANDROID_PIXEL_FORMAT_JPEG 0x21 -static inline void wrapYyjsonFree(yyjson_doc** doc) { - assert(doc); - if (*doc) { - yyjson_doc_free(*doc); +// Records the largest size the camera can stream in the given pixel format. The stream configurations +// are a flat array of (format, width, height, isInput) quads; a negative format matches any of them. +static void ffCameraMaxStreamSize(const ACameraMetadata* metadata, int32_t format, uint32_t* width, uint32_t* height) { + ACameraMetadata_const_entry entry; + if (ACameraMetadata_getConstEntry(metadata, ACAMERA_SCALER_AVAILABLE_STREAM_CONFIGURATIONS, &entry) != ACAMERA_OK) { + return; + } + if (entry.type != ACAMERA_TYPE_INT32) { + return; + } + + uint64_t maxArea = 0; + for (uint32_t i = 0; i + 3 < entry.count; i += 4) { + if (entry.data.i32[i + 3] != ACAMERA_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT) { + continue; + } + if (format >= 0 && entry.data.i32[i] != format) { + continue; + } + + uint32_t w = (uint32_t) entry.data.i32[i + 1]; + uint32_t h = (uint32_t) entry.data.i32[i + 2]; + if ((uint64_t) w * h > maxArea) { + maxArea = (uint64_t) w * h; + *width = w; + *height = h; + } } } -const char* ffDetectCamera([[maybe_unused]] FFlist* result) { - FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate(); - - if (ffProcessAppendStdOut(&buffer, (char* const[]) { FF_TERMUX_API_PATH, FF_TERMUX_API_PARAM, nullptr })) { - return "Starting `" FF_TERMUX_API_PATH " " FF_TERMUX_API_PARAM "` failed"; +const char* ffDetectCamera(FFlist* result) { + // The camera2 NDK and every entry point below were introduced in API 24, which is the API level + // this build targets, so nothing here is newer than the minimum supported version and + // common/androidApi.h has nothing to guard. That header covers the opposite case: entry points + // the NDK marks unavailable because they postdate the target, such as AImageDecoder (30) or + // AMediaCodec_getName (28). It also only ever makes *symbols* weak -- libcamera2ndk.so itself is + // API 24, so linking it unconditionally in CMakeLists.txt is fine on every supported device. + ACameraManager* manager = ACameraManager_create(); + if (!manager) { + return "ACameraManager_create() failed"; } - [[gnu::cleanup(wrapYyjsonFree)]] yyjson_doc* doc = yyjson_read_opts(buffer.chars, buffer.length, 0, nullptr, nullptr); - if (!doc) { - return "Failed to parse camera info"; + ACameraIdList* idList = nullptr; + if (ACameraManager_getCameraIdList(manager, &idList) != ACAMERA_OK || !idList) { + ACameraManager_delete(manager); + return "ACameraManager_getCameraIdList() failed"; } - yyjson_val* root = yyjson_doc_get_root(doc); - if (!yyjson_is_arr(root)) { - return "Camera info result is not a JSON array"; - } + for (int32_t i = 0; i < idList->numCameras; ++i) { + const char* id = idList->cameraIds[i]; + + ACameraMetadata* metadata = nullptr; + if (ACameraManager_getCameraCharacteristics(manager, id, &metadata) != ACAMERA_OK || !metadata) { + continue; + } - yyjson_val* device; - size_t idx, max; - yyjson_arr_foreach (root, idx, max, device) { FFCameraResult* camera = FF_LIST_ADD(FFCameraResult, *result); - { - const char* facing = yyjson_get_str(yyjson_obj_get(device, "facing")); - if (facing) { - ffStrbufInitF(&camera->name, "builtin-%s", facing); - } else { - ffStrbufInitStatic(&camera->name, "Unknown"); - } - } ffStrbufInit(&camera->vendor); - ffStrbufInitJsonVal(&camera->id, yyjson_obj_get(device, "id")); - yyjson_val* sizes = yyjson_arr_get_first(yyjson_obj_get(device, "jpeg_output_sizes")); - if (yyjson_is_obj(sizes)) { - camera->width = (uint32_t) yyjson_get_uint(yyjson_obj_get(sizes, "width")); - camera->height = (uint32_t) yyjson_get_uint(yyjson_obj_get(sizes, "height")); - } else { - camera->width = camera->height = 0; - } ffStrbufInit(&camera->colorspace); + ffStrbufInitS(&camera->id, id); + + ACameraMetadata_const_entry facing; + if (ACameraMetadata_getConstEntry(metadata, ACAMERA_LENS_FACING, &facing) == ACAMERA_OK && facing.type == ACAMERA_TYPE_BYTE && facing.count >= 1) { + switch (facing.data.u8[0]) { + case ACAMERA_LENS_FACING_FRONT: + ffStrbufInitStatic(&camera->name, "builtin-front"); + break; + case ACAMERA_LENS_FACING_BACK: + ffStrbufInitStatic(&camera->name, "builtin-back"); + break; + case ACAMERA_LENS_FACING_EXTERNAL: + ffStrbufInitStatic(&camera->name, "builtin-external"); + break; + default: + ffStrbufInitStatic(&camera->name, "Unknown"); + break; + } + } else { + ffStrbufInitStatic(&camera->name, "Unknown"); + } + + camera->width = camera->height = 0; + ffCameraMaxStreamSize(metadata, FF_ANDROID_PIXEL_FORMAT_JPEG, &camera->width, &camera->height); + if (camera->width == 0) { + // Not every camera HAL lists a JPEG format. The largest size of any output format is the + // same resolution on those devices. + ffCameraMaxStreamSize(metadata, -1, &camera->width, &camera->height); + } + + ACameraMetadata_free(metadata); } + ACameraManager_deleteCameraIdList(idList); + ACameraManager_delete(manager); + return nullptr; }