From db7be07c9c973deee771149eb1841215c08c6afb Mon Sep 17 00:00:00 2001 From: Grzegorz Jaszczyk Date: Wed, 24 Jan 2024 14:07:13 +0000 Subject: [PATCH] ExternalCameraDevice: increase max bytes per pixel This fixes some USB external camera which fails to initialize with: I ExtCamDevSsn@3.4: configureV4l2StreamLocked: V4L2 buffer size is 614989 E ExtCamDevSsn@3.4: configureV4l2StreamLocked: V4L2 buffer size: 614989 looks invalid. Expected maximum size: 614400 E ExtCamDevSsn@3.4: V4L configuration failed!, format:MJPG, w 640, h 480 BUG=b:326773369, b:309244873 Test: Manual camera operation verification Change-Id: I532bef429792f5a841034a4f3d4eadfa6ed78b2a Reviewed-by: Tomasz Nowicki Tested-by: Tomasz Nowicki Reviewed-by: Konrad Adamczyk --- .../include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h | 2 +- camera/device/default/ExternalCameraDeviceSession.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h b/camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h index 184c16e591..d92a4091a7 100644 --- a/camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h +++ b/camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h @@ -109,7 +109,7 @@ struct ExternalCameraDeviceSession : public virtual RefBase, static const int kMaxProcessedStream = 2; static const int kMaxStallStream = 1; - static const uint32_t kMaxBytesPerPixel = 2; + static const uint32_t kMaxBytesPerPixel = 3; class OutputThread : public android::Thread { public: diff --git a/camera/device/default/ExternalCameraDeviceSession.h b/camera/device/default/ExternalCameraDeviceSession.h index 1c6ed060c8..ed849316b4 100644 --- a/camera/device/default/ExternalCameraDeviceSession.h +++ b/camera/device/default/ExternalCameraDeviceSession.h @@ -122,7 +122,7 @@ class ExternalCameraDeviceSession : public BnCameraDeviceSession, public OutputT static const int kMaxProcessedStream = 2; static const int kMaxStallStream = 1; - static const uint32_t kMaxBytesPerPixel = 2; + static const uint32_t kMaxBytesPerPixel = 3; class BufferRequestThread : public SimpleThread { public: