From 71a85bd245540ee14ca9d2b30ba73b1b81bc8a0d Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Thu, 21 Apr 2022 16:44:09 +0000 Subject: [PATCH] Revert "Revert "ANDROID: media: increase video max frame number"" This reverts commit 833169bb8db9881e36fc6d0939b193ba1ee17288. Reason for revert: All kernels since Jan 2020 have "#define VIDEO_MAX_FRAME 64" and partner vendor code relies on this. Since bionic headers come from android-mainline, we need to keep the "64" setting. Bug: 228783882 Bug: 143356419 Change-Id: I3ad1a1fc603d5e259c23fbee9b921a2705012deb Signed-off-by: Todd Kjos --- include/media/videobuf2-core.h | 2 +- include/uapi/linux/videodev2.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 5468b633b9d2..caa308c85b26 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -20,7 +20,7 @@ #include #include -#define VB2_MAX_FRAME (32) +#define VB2_MAX_FRAME (64) #define VB2_MAX_PLANES (8) /** diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 3768a0a80830..cbf205869fcf 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h @@ -70,7 +70,7 @@ * Common stuff for both V4L1 and V4L2 * Moved from videodev.h */ -#define VIDEO_MAX_FRAME 32 +#define VIDEO_MAX_FRAME 64 #define VIDEO_MAX_PLANES 8 /*