| commit | 2ae5b57e46eee84aab8f7a0f9909c60b4b770645 | [log] [tgz] |
|---|---|---|
| author | Alexandre Courbot <[email protected]> | Thu Sep 24 01:15:24 2020 |
| committer | Commit Bot <[email protected]> | Thu Oct 01 06:16:09 2020 |
| tree | 694d607ee703be3eca76e8c7d5359e21813c7daf | |
| parent | d27429f1376504e4f46a4c4fefdced350339ff55 [diff] |
libv4l-rockchip_v2: remove V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR has been purged from our codebase and replaced by V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR. Remove support for it to avoid using this non-upstream control. BUG=b:167992324 TEST=emerge-kevin libv4lplugins Change-Id: I66c57d913dcef92782e98598dc17753d7523e4f8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/libv4lplugins/+/2425927 Tested-by: Alexandre Courbot <[email protected]> Reviewed-by: Chih-Yu Huang <[email protected]> Commit-Queue: Alexandre Courbot <[email protected]>
diff --git a/libv4l-rockchip_v2/libv4l-encplugin-rockchip.c b/libv4l-rockchip_v2/libv4l-encplugin-rockchip.c index 270cd28..e075cc9 100644 --- a/libv4l-rockchip_v2/libv4l-encplugin-rockchip.c +++ b/libv4l-rockchip_v2/libv4l-encplugin-rockchip.c
@@ -503,7 +503,6 @@ case V4L2_CID_MPEG_VIDEO_BITRATE: runtime_param_ptr->bitrate = ext_ctrls->controls[i].value; break; - case V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR: case V4L2_CID_MPEG_VIDEO_PREPEND_SPSPPS_TO_IDR: ctx->init_param.h264e.h264_sps_pps_before_idr = ext_ctrls->controls[i].value;
diff --git a/libv4l-rockchip_v2/libvepu/rk_vepu_interface.h b/libv4l-rockchip_v2/libvepu/rk_vepu_interface.h index 31727ea..09d5142 100644 --- a/libv4l-rockchip_v2/libvepu/rk_vepu_interface.h +++ b/libv4l-rockchip_v2/libvepu/rk_vepu_interface.h
@@ -24,10 +24,6 @@ #define V4L2_CID_PRIVATE_ROCKCHIP_HW_PARAMS (V4L2_CID_CUSTOM_BASE + 2) #define V4L2_CID_PRIVATE_ROCKCHIP_GET_PARAMS (V4L2_CID_CUSTOM_BASE + 3) -#ifndef V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR -#define V4L2_CID_MPEG_VIDEO_H264_SPS_PPS_BEFORE_IDR (V4L2_CID_MPEG_BASE+388) -#endif - /* The maximum number of controls returned by rk_vepu_get_config(). */ #define MAX_NUM_GET_CONFIG_CTRLS 5