diff options
| author | Jerry Huang <huangjerry@google.com> | 2021-07-30 14:44:40 +0800 |
|---|---|---|
| committer | Jerry Huang <huangjerry@google.com> | 2021-07-30 14:54:29 +0800 |
| commit | ad7d0167748dcc3858b7e8e6cf6bd9c7ac417e6b (patch) | |
| tree | bd6479a6ce30cc1988b16ddde68d8ff1c81f05e8 /sm7150 | |
| parent | 9cffce91bc4965939d9d11b0ec21baa833912646 (diff) | |
| download | sunfish-kernel-ad7d0167748dcc3858b7e8e6cf6bd9c7ac417e6b.tar.gz | |
sunfish: update kernel-and-modules prebuilt
Linux version 4.14.234-g9f6bc0d31c72-ab7590418 (android-build@abfarm-
east4-006) (Android (7284624, based on r416183b) clang version
12.0.5 (https://android.googlesource.com/toolchain/llvm-project
c935d99d7cf2016289302412d708641d52d2f7ee), LLD 12.0.5
(/buildbot/src/android/llvm-toolchain/out/llvm-project/lld
c935d99d7cf2016289302412d708641d52d2f7ee)) #1 SMP PREEMPT Wed Jul
28 12:04:46 UTC 2021
private/msm-google: (5 changes)
9f6bc0d3 msm: vidc: Allow NRT session above max load
af3182d6 msm: vidc: Add support for encoder complexity
052081ff msm: venc: Cap operating rate between max and min
ec522e44 msm: vidc: Cap operating rate between max and min
3ac419a7 soc: qcom: watchdog_v2: shorten bite time when suspend/resume
Bug: 183999084
Bug: 184576106
Bug: 190429220
Pick-Prebuilt: 387134581
Build-Id: 7590418
Processing-Config: kernel_headers
Change-Id: I3c7e25749f62cfc8ace885363f1724a52d77f1c4
Signed-off-by: Jerry Huang <huangjerry@google.com>
Diffstat (limited to 'sm7150')
| -rw-r--r-- | sm7150/kernel-headers/linux/v4l2-controls.h | 1 | ||||
| -rw-r--r-- | sm7150/original-kernel-headers/linux/v4l2-controls.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/sm7150/kernel-headers/linux/v4l2-controls.h b/sm7150/kernel-headers/linux/v4l2-controls.h index 07908150d..368573490 100644 --- a/sm7150/kernel-headers/linux/v4l2-controls.h +++ b/sm7150/kernel-headers/linux/v4l2-controls.h @@ -1067,6 +1067,7 @@ enum v4l2_mpeg_vidc_video_h264_vui_timing_info { V4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_DISABLED = 0, V4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_ENABLED = 1 }; +#define V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY (V4L2_CID_MPEG_MSM_VIDC_BASE + 167) #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) #define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1) #define V4L2_CID_EXPOSURE_AUTO (V4L2_CID_CAMERA_CLASS_BASE + 1) diff --git a/sm7150/original-kernel-headers/linux/v4l2-controls.h b/sm7150/original-kernel-headers/linux/v4l2-controls.h index 1b829dcae..2353058c1 100644 --- a/sm7150/original-kernel-headers/linux/v4l2-controls.h +++ b/sm7150/original-kernel-headers/linux/v4l2-controls.h @@ -1445,6 +1445,9 @@ enum v4l2_mpeg_vidc_video_h264_vui_timing_info { V4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_ENABLED = 1 }; +#define V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 167) + /* Camera class control IDs */ #define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900) |