[Patch v2 10/11] s5p-mfc: Add support for HEVC encoder
Andrzej Hajda
a.hajda at samsung.com
Tue Mar 7 03:33:46 PST 2017
On 03.03.2017 10:07, Smitha T Murthy wrote:
> Add HEVC encoder support and necessary registers, V4L2 CIDs,
> and hevc encoder parameters
>
> Signed-off-by: Smitha T Murthy <smitha.t at samsung.com>
> ---
> drivers/media/platform/s5p-mfc/regs-mfc-v10.h | 28 +-
> drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 3 +
> drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 55 ++-
> drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 595 +++++++++++++++++++++++
> drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 8 +
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 200 ++++++++
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 8 +
> 8 files changed, 896 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h
> index 846dcf5..caf02ff 100644
> --- a/drivers/media/platform/s5p-mfc/regs-mfc-v10.h
> +++ b/drivers/media/platform/s5p-mfc/regs-mfc-v10.h
> @@ -20,13 +20,35 @@
> #define S5P_FIMV_MFC_STATE_V10 0x7124
> #define S5P_FIMV_D_STATIC_BUFFER_ADDR_V10 0xF570
> #define S5P_FIMV_D_STATIC_BUFFER_SIZE_V10 0xF574
> +#define S5P_FIMV_E_NUM_T_LAYER_V10 0xFBAC
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER0_V10 0xFBB0
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER1_V10 0xFBB4
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER2_V10 0xFBB8
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER3_V10 0xFBBC
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER4_V10 0xFBC0
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER5_V10 0xFBC4
> +#define S5P_FIMV_E_HIERARCHICAL_QP_LAYER6_V10 0xFBC8
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0_V10 0xFD18
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER1_V10 0xFD1C
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER2_V10 0xFD20
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER3_V10 0xFD24
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER4_V10 0xFD28
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER5_V10 0xFD2C
> +#define S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER6_V10 0xFD30
> +#define S5P_FIMV_E_HEVC_OPTIONS_V10 0xFDD4
> +#define S5P_FIMV_E_HEVC_REFRESH_PERIOD_V10 0xFDD8
> +#define S5P_FIMV_E_HEVC_CHROMA_QP_OFFSET_V10 0xFDDC
> +#define S5P_FIMV_E_HEVC_LF_BETA_OFFSET_DIV2_V10 0xFDE0
> +#define S5P_FIMV_E_HEVC_LF_TC_OFFSET_DIV2_V10 0xFDE4
> +#define S5P_FIMV_E_HEVC_NAL_CONTROL_V10 0xFDE8
>
> /* MFCv10 Context buffer sizes */
> #define MFC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */
> #define MFC_H264_DEC_CTX_BUF_SIZE_V10 (2 * SZ_1M) /* 2MB */
> #define MFC_OTHER_DEC_CTX_BUF_SIZE_V10 (20 * SZ_1K) /* 20KB */
> #define MFC_H264_ENC_CTX_BUF_SIZE_V10 (100 * SZ_1K) /* 100KB */
> -#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */
> +#define MFC_HEVC_ENC_CTX_BUF_SIZE_V10 (30 * SZ_1K) /* 30KB */
> +#define MFC_OTHER_ENC_CTX_BUF_SIZE_V10 (15 * SZ_1K) /* 15KB */
>
> /* MFCv10 variant defines */
> #define MAX_FW_SIZE_V10 (SZ_1M) /* 1MB */
> @@ -58,5 +80,9 @@
> #define ENC_V100_VP8_ME_SIZE(x, y) \
> ENC_V100_BASE_SIZE(x, y)
>
> +#define ENC_V100_HEVC_ME_SIZE(x, y) \
> + (((x + 3) * (y + 3) * 32) \
> + + ((y * 128) + 1280) * DIV_ROUND_UP(x, 4))
> +
> #endif /*_REGS_MFC_V10_H*/
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index b014038..b01c556 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -1549,6 +1549,7 @@ static int s5p_mfc_resume(struct device *dev)
> .h264_dec_ctx = MFC_H264_DEC_CTX_BUF_SIZE_V10,
> .other_dec_ctx = MFC_OTHER_DEC_CTX_BUF_SIZE_V10,
> .h264_enc_ctx = MFC_H264_ENC_CTX_BUF_SIZE_V10,
> + .hevc_enc_ctx = MFC_HEVC_ENC_CTX_BUF_SIZE_V10,
> .other_enc_ctx = MFC_OTHER_ENC_CTX_BUF_SIZE_V10,
> };
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
> index 102b47e..7521fce 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
> @@ -122,6 +122,9 @@ static int s5p_mfc_open_inst_cmd_v6(struct s5p_mfc_ctx *ctx)
> case S5P_MFC_CODEC_VP8_ENC:
> codec_type = S5P_FIMV_CODEC_VP8_ENC_V7;
> break;
> + case S5P_MFC_CODEC_HEVC_ENC:
> + codec_type = S5P_FIMV_CODEC_HEVC_ENC;
> + break;
> default:
> codec_type = S5P_FIMV_CODEC_NONE_V6;
> }
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index e720ce6..c55fa6c 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -68,7 +68,7 @@ static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b)
> #define MFC_ENC_CAP_PLANE_COUNT 1
> #define MFC_ENC_OUT_PLANE_COUNT 2
> #define STUFF_BYTE 4
> -#define MFC_MAX_CTRLS 77
> +#define MFC_MAX_CTRLS 128
>
> #define S5P_MFC_CODEC_NONE -1
> #define S5P_MFC_CODEC_H264_DEC 0
> @@ -87,6 +87,7 @@ static inline dma_addr_t s5p_mfc_mem_cookie(void *a, void *b)
> #define S5P_MFC_CODEC_MPEG4_ENC 22
> #define S5P_MFC_CODEC_H263_ENC 23
> #define S5P_MFC_CODEC_VP8_ENC 24
> +#define S5P_MFC_CODEC_HEVC_ENC 26
>
> #define S5P_MFC_R2H_CMD_EMPTY 0
> #define S5P_MFC_R2H_CMD_SYS_INIT_RET 1
> @@ -222,6 +223,7 @@ struct s5p_mfc_buf_size_v6 {
> unsigned int h264_dec_ctx;
> unsigned int other_dec_ctx;
> unsigned int h264_enc_ctx;
> + unsigned int hevc_enc_ctx;
> unsigned int other_enc_ctx;
> };
>
> @@ -440,6 +442,56 @@ struct s5p_mfc_vp8_enc_params {
> u8 profile;
> };
>
> +struct s5p_mfc_hevc_enc_params {
> + u8 level;
> + u8 tier_flag;
> + /* HEVC Only */
> + u32 rc_framerate;
> + u8 rc_min_qp;
> + u8 rc_max_qp;
> + u8 rc_lcu_dark;
> + u8 rc_lcu_smooth;
> + u8 rc_lcu_static;
> + u8 rc_lcu_activity;
> + u8 rc_frame_qp;
> + u8 rc_p_frame_qp;
> + u8 rc_b_frame_qp;
> + u8 max_partition_depth;
> + u8 num_refs_for_p;
> + u8 refreshtype;
> + u16 refreshperiod;
> + s32 lf_beta_offset_div2;
> + s32 lf_tc_offset_div2;
> + u8 loopfilter_disable;
> + u8 loopfilter_across;
> + u8 nal_control_length_filed;
> + u8 nal_control_user_ref;
> + u8 nal_control_store_ref;
> + u8 const_intra_period_enable;
> + u8 lossless_cu_enable;
> + u8 wavefront_enable;
> + u8 enable_ltr;
> + u8 hier_qp_enable;
> + enum v4l2_mpeg_video_hevc_hier_coding_type hier_qp_type;
> + u8 hier_ref_type;
> + u8 num_hier_layer;
> + u8 hier_qp_layer[7];
> + u32 hier_bit_layer[7];
> + u8 sign_data_hiding;
> + u8 general_pb_enable;
> + u8 temporal_id_enable;
> + u8 strong_intra_smooth;
> + u8 intra_pu_split_disable;
> + u8 tmv_prediction_disable;
> + u8 max_num_merge_mv;
> + u8 eco_mode_enable;
> + u8 encoding_nostartcode_enable;
> + u8 size_of_length_field;
> + u8 use_ref;
> + u8 store_ref;
> + u8 prepend_sps_pps_to_idr;
> +};
> +
> /**
> * struct s5p_mfc_enc_params - general encoding parameters
> */
> @@ -477,6 +529,7 @@ struct s5p_mfc_enc_params {
> struct s5p_mfc_h264_enc_params h264;
> struct s5p_mfc_mpeg4_enc_params mpeg4;
> struct s5p_mfc_vp8_enc_params vp8;
> + struct s5p_mfc_hevc_enc_params hevc;
> } codec;
>
> };
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> index 6623f79..4a6fbee3 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
> @@ -104,6 +104,14 @@
> .num_planes = 1,
> .versions = MFC_V7_BIT | MFC_V8_BIT | MFC_V10_BIT,
> },
> + {
> + .name = "HEVC Encoded Stream",
> + .fourcc = V4L2_PIX_FMT_HEVC,
> + .codec_mode = S5P_FIMV_CODEC_HEVC_ENC,
> + .type = MFC_FMT_ENC,
> + .num_planes = 1,
> + .versions = MFC_V10_BIT,
> + },
> };
>
> #define NUM_FORMATS ARRAY_SIZE(formats)
> @@ -698,6 +706,447 @@
> .default_value = 0,
> },
> {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Frame QP value",
> + .minimum = 0,
> + .maximum = 51,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC P frame QP value",
> + .minimum = 0,
> + .maximum = 51,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC B frame QP value",
> + .minimum = 0,
> + .maximum = 51,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Minimum QP value",
> + .minimum = 0,
> + .maximum = 51,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Maximum QP value",
> + .minimum = 0,
> + .maximum = 51,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_DARK,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC dark region adaptive",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_SMOOTH,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC smooth region adaptive",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_STATIC,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC static region adaptive",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_ACTIVITY,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC activity adaptive",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_PROFILE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Profile",
> + .minimum = 0,
> + .maximum = 0,
Why bool? There should be multiple profiles I suppose.
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LEVEL,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC level",
> + .minimum = 10,
> + .maximum = 62,
> + .step = 1,
> + .default_value = 10,
I think it should be done rather as menu, as in case of mpeg_h264_level,
mpeg_mpeg4_level, etc, also look at h264_profile and similar [1].
[1]:
http://lxr.free-electrons.com/source/drivers/media/v4l2-core/v4l2-ctrls.c#L323
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_TIER_FLAG,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC tier_flag default is Main",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_RC_FRAME_RATE,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Frame rate",
> + .minimum = 1,
> + .maximum = (1 << 16) - 1,
Hmm, wikipedia says "The maximum frame rate supported by HEVC is 300
frames per second (fps)", does the HW supports more, I suppose for
non-runtime encoder it does not matter, anyway it looks odd :)
> + .step = 1,
> + .default_value = 1,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_MAX_PARTITION_DEPTH,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Maximum coding unit depth",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
Max depth should not be bool.
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_REF_NUMBER_FOR_PFRAMES,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Number of reference picture",
> + .minimum = 1,
> + .maximum = 2,
> + .step = 1,
> + .default_value = 1,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_TYPE,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Number of reference picture",
Incorrect name. ID suggest it should be menu and enums.
> + .minimum = 0,
> + .maximum = 2,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_CONST_INTRA_PRED_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC refresh type",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC lossless encoding select",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_WAVEFRONT_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Wavefront enable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LF_DISABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Filter disable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
Maybe instead of "disable" in name you should change default value to
true and set name to just "HEVC Filter".
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LF_SLICE_BOUNDARY,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "across or not slice boundary",
Name not fixed.
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LTR_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "long term reference enable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_QP_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "QP values for temporal layer",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_TYPE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "Hierarchical Coding Type",
> + .minimum = V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_B,
> + .maximum = V4L2_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_P,
For type, enums and menu should be rather used, not bool.
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer",
> + .minimum = 0,
> + .maximum = 7,
Shouldn't it be 6?
> + .step = 1,
> + .default_value = 0,
There are enums V4L2_MPEG_VIDEO_HEVC_HIERARCHIAL_CODING_LAYER[0-6]
defined in other patches. You should decide what is better: either pure
numbers 0-6, either enums and menu.
I cannot help because I do not know what it is.
Are you sure this control should be described as above? From what I have
found from quick googling I would expect rather something as maximal
number of layers in hierarchical coding.
Could you explain in few words what these layers are?
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_QP,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer QP",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT0,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT0",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT1,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT1",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT2,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT2",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT3,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT3",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT4,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT4",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT5,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT5",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT6,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer BIT6",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
What BIT stands for?
I see BIT0 to BIT6, is it somehow connected with value of
V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER ?
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_CH,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Hierarchical Coding Layer Change",
> + .minimum = INT_MIN,
> + .maximum = INT_MAX,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_SIGN_DATA_HIDING,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Sign data hiding",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_GENERAL_PB_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC General pb enable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_TEMPORAL_ID_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Temporal id enable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_STRONG_SMOTHING_FLAG,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC Strong intra smoothing flag",
flag word can be removed, as well as "... enable" in other bool controls.
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_DISABLE_INTRA_PU_SPLIT,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC disable intra pu split",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
Again you can reverse the flag and set default value to 1, here and below.
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_DISABLE_TMV_PREDICTION,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "HEVC disable tmv prediction",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_MAX_NUM_MERGE_MV_MINUS1,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "max number of candidate MVs",
> + .minimum = 0,
> + .maximum = 4,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_WITHOUT_STARTCODE_ENABLE,
> + .type = V4L2_CTRL_TYPE_BOOLEAN,
> + .name = "ENC without startcode enable",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_PERIOD,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC Number of reference picture",
Id and type does not match. I suppose it is intentionally (after looking
at documentation from next patch), but it is still unclear. As I
understand it is a number of I-frames between two consecutive
IDR-frames, am I right? Maybe "HEVC IDR/I frame rate", I hope you will
find better name :)
> + .minimum = 0,
> + .maximum = (1 << 16) - 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LF_BETA_OFFSET_DIV2,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC loop filter beta offset",
> + .minimum = -6,
> + .maximum = 6,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_LF_TC_OFFSET_DIV2,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC loop filter tc offset",
> + .minimum = -6,
> + .maximum = 6,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "HEVC size of length field",
> + .minimum = 0,
> + .maximum = 3,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_USE_REF,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "user long term reference frame",
s/user/use/
> + .minimum = 0,
> + .maximum = 1,
Documentation says about values 0, 1, 2, 3.
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_STORE_REF,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "store long term reference frame",
> + .minimum = 0,
> + .maximum = 2,
> + .step = 1,
> + .default_value = 0,
> + },
Two above controls are set per-frame/buffer. V4L2 currently does not
support controls per frame, so I suppose you should drop them.
> + {
> + .id = V4L2_CID_MPEG_VIDEO_HEVC_PREPEND_SPSPPS_TO_IDR,
> + .type = V4L2_CTRL_TYPE_INTEGER,
> + .name = "Prepend SPS/PPS to every IDR",
> + .minimum = 0,
> + .maximum = 1,
> + .step = 1,
> + .default_value = 0,
> + },
> + {
> .id = V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
> .type = V4L2_CTRL_TYPE_INTEGER,
> .name = "Minimum number of output bufs",
> @@ -1640,6 +2089,152 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
> case V4L2_CID_MPEG_VIDEO_VPX_PROFILE:
> p->codec.vp8.profile = ctrl->val;
> break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_I_FRAME_QP:
> + p->codec.hevc.rc_frame_qp = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_P_FRAME_QP:
> + p->codec.hevc.rc_p_frame_qp = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_B_FRAME_QP:
> + p->codec.hevc.rc_b_frame_qp = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_RC_FRAME_RATE:
> + p->codec.hevc.rc_framerate = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_MIN_QP:
> + p->codec.hevc.rc_min_qp = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_MAX_QP:
> + p->codec.hevc.rc_max_qp = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LEVEL:
> + p->codec.hevc.level = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_PROFILE:
> + break;
Whats wrong with profile? Why it is not interpreted?
The rest looks OK.
Regards
Andrzej
> + case V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_DARK:
> + p->codec.hevc.rc_lcu_dark = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_SMOOTH:
> + p->codec.hevc.rc_lcu_smooth = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_STATIC:
> + p->codec.hevc.rc_lcu_static = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_ADAPTIVE_RC_ACTIVITY:
> + p->codec.hevc.rc_lcu_activity = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_TIER_FLAG:
> + p->codec.hevc.tier_flag = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_MAX_PARTITION_DEPTH:
> + p->codec.hevc.max_partition_depth = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_REF_NUMBER_FOR_PFRAMES:
> + p->codec.hevc.num_refs_for_p = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_TYPE:
> + p->codec.hevc.refreshtype = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_CONST_INTRA_PRED_ENABLE:
> + p->codec.hevc.const_intra_period_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LOSSLESS_CU_ENABLE:
> + p->codec.hevc.lossless_cu_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_WAVEFRONT_ENABLE:
> + p->codec.hevc.wavefront_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LF_DISABLE:
> + p->codec.hevc.loopfilter_disable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LF_SLICE_BOUNDARY:
> + p->codec.hevc.loopfilter_across = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LTR_ENABLE:
> + p->codec.hevc.enable_ltr = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_QP_ENABLE:
> + p->codec.hevc.hier_qp_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_TYPE:
> + p->codec.hevc.hier_qp_type =
> + (enum v4l2_mpeg_video_hevc_hier_coding_type)(ctrl->val);
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER:
> + p->codec.hevc.num_hier_layer = ctrl->val & 0x7;
> + p->codec.hevc.hier_ref_type = (ctrl->val >> 16) & 0x1;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_QP:
> + p->codec.hevc.hier_qp_layer[(ctrl->val >> 16) & 0x7]
> + = ctrl->val & 0xFF;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT0:
> + p->codec.hevc.hier_bit_layer[0] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT1:
> + p->codec.hevc.hier_bit_layer[1] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT2:
> + p->codec.hevc.hier_bit_layer[2] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT3:
> + p->codec.hevc.hier_bit_layer[3] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT4:
> + p->codec.hevc.hier_bit_layer[4] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT5:
> + p->codec.hevc.hier_bit_layer[5] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_HIERARCHICAL_CODING_LAYER_BIT6:
> + p->codec.hevc.hier_bit_layer[6] = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_SIGN_DATA_HIDING:
> + p->codec.hevc.sign_data_hiding = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_GENERAL_PB_ENABLE:
> + p->codec.hevc.general_pb_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_TEMPORAL_ID_ENABLE:
> + p->codec.hevc.temporal_id_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_STRONG_SMOTHING_FLAG:
> + p->codec.hevc.strong_intra_smooth = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_DISABLE_INTRA_PU_SPLIT:
> + p->codec.hevc.intra_pu_split_disable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_DISABLE_TMV_PREDICTION:
> + p->codec.hevc.tmv_prediction_disable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_MAX_NUM_MERGE_MV_MINUS1:
> + p->codec.hevc.max_num_merge_mv = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_WITHOUT_STARTCODE_ENABLE:
> + p->codec.hevc.encoding_nostartcode_enable = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_REFRESH_PERIOD:
> + p->codec.hevc.refreshperiod = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LF_BETA_OFFSET_DIV2:
> + p->codec.hevc.lf_beta_offset_div2 = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_LF_TC_OFFSET_DIV2:
> + p->codec.hevc.lf_tc_offset_div2 = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_SIZE_OF_LENGTH_FIELD:
> + p->codec.hevc.size_of_length_field = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_USE_REF:
> + p->codec.hevc.use_ref = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_STORE_REF:
> + p->codec.hevc.store_ref = ctrl->val;
> + break;
> + case V4L2_CID_MPEG_VIDEO_HEVC_PREPEND_SPSPPS_TO_IDR:
> + p->codec.hevc.prepend_sps_pps_to_idr = ctrl->val;
> + break;
> default:
> v4l2_err(&dev->v4l2_dev, "Invalid control, id=%d, val=%d\n",
> ctrl->id, ctrl->val);
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> index 565decf..7751272 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr.h
> @@ -272,6 +272,14 @@ struct s5p_mfc_regs {
> void __iomem *e_vp8_hierarchical_qp_layer1;/* v7 and v8 */
> void __iomem *e_vp8_hierarchical_qp_layer2;/* v7 and v8 */
> void __iomem *e_min_scratch_buffer_size; /* v10 */
> + void __iomem *e_num_t_layer; /* v10 */
> + void __iomem *e_hier_qp_layer0; /* v10 */
> + void __iomem *e_hier_bit_rate_layer0; /* v10 */
> + void __iomem *e_hevc_options; /* v10 */
> + void __iomem *e_hevc_refresh_period; /* v10 */
> + void __iomem *e_hevc_lf_beta_offset_div2; /* v10 */
> + void __iomem *e_hevc_lf_tc_offset_div2; /* v10 */
> + void __iomem *e_hevc_nal_control; /* v10 */
> };
>
> struct s5p_mfc_hw_ops {
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> index 7dcc671..7aa7e41 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
> @@ -301,6 +301,17 @@ static int s5p_mfc_alloc_codec_buffers_v6(struct s5p_mfc_ctx *ctx)
> ctx->chroma_dpb_size + ctx->me_buffer_size));
> ctx->bank2.size = 0;
> break;
> + case S5P_MFC_CODEC_HEVC_ENC:
> + mfc_debug(2, "Use min scratch buffer size\n");
> + ctx->me_buffer_size =
> + ALIGN(ENC_V100_HEVC_ME_SIZE(lcu_width, lcu_height), 16);
> + ctx->scratch_buf_size = ALIGN(ctx->scratch_buf_size, 256);
> + ctx->bank1.size =
> + ctx->scratch_buf_size + ctx->tmv_buffer_size +
> + (ctx->pb_count * (ctx->luma_dpb_size +
> + ctx->chroma_dpb_size + ctx->me_buffer_size));
> + ctx->bank2.size = 0;
> + break;
> default:
> break;
> }
> @@ -351,6 +362,9 @@ static int s5p_mfc_alloc_instance_buffer_v6(struct s5p_mfc_ctx *ctx)
> case S5P_MFC_CODEC_H264_ENC:
> ctx->ctx.size = buf_size->h264_enc_ctx;
> break;
> + case S5P_MFC_CODEC_HEVC_ENC:
> + ctx->ctx.size = buf_size->hevc_enc_ctx;
> + break;
> case S5P_MFC_CODEC_MPEG4_ENC:
> case S5P_MFC_CODEC_H263_ENC:
> case S5P_MFC_CODEC_VP8_ENC:
> @@ -1433,6 +1447,180 @@ static int s5p_mfc_set_enc_params_vp8(struct s5p_mfc_ctx *ctx)
> return 0;
> }
>
> +static int s5p_mfc_set_enc_params_hevc(struct s5p_mfc_ctx *ctx)
> +{
> + struct s5p_mfc_dev *dev = ctx->dev;
> + const struct s5p_mfc_regs *mfc_regs = dev->mfc_regs;
> + struct s5p_mfc_enc_params *p = &ctx->enc_params;
> + struct s5p_mfc_hevc_enc_params *p_hevc = &p->codec.hevc;
> + unsigned int reg = 0;
> + int i;
> +
> + mfc_debug_enter();
> +
> + s5p_mfc_set_enc_params(ctx);
> +
> + /* pictype : number of B */
> + reg = readl(mfc_regs->e_gop_config);
> + /* num_b_frame - 0 ~ 2 */
> + reg &= ~(0x3 << 16);
> + reg |= (p->num_b_frame << 16);
> + writel(reg, mfc_regs->e_gop_config);
> +
> + /* UHD encoding case */
> + if ((ctx->img_width == 3840) && (ctx->img_height == 2160)) {
> + p_hevc->level = 51;
> + p_hevc->tier_flag = 0;
> + /* this tier_flag can be changed */
> + }
> +
> + /* tier_flag & level */
> + reg = 0;
> + /* level */
> + reg &= ~(0xFF << 8);
> + reg |= (p_hevc->level << 8);
> + /* tier_flag - 0 ~ 1 */
> + reg |= (p_hevc->tier_flag << 16);
> + writel(reg, mfc_regs->e_picture_profile);
> +
> + /* max partition depth */
> + reg = 0;
> + reg |= (p_hevc->max_partition_depth & 0x1);
> + reg |= (p_hevc->num_refs_for_p-1) << 2;
> + reg |= (2 << 3); /* always set IDR encoding */
> + reg |= (p_hevc->const_intra_period_enable & 0x1) << 5;
> + reg |= (p_hevc->lossless_cu_enable & 0x1) << 6;
> + reg |= (p_hevc->wavefront_enable & 0x1) << 7;
> + reg |= (p_hevc->loopfilter_disable & 0x1) << 8;
> + reg |= (p_hevc->loopfilter_across & 0x1) << 9;
> + reg |= (p_hevc->enable_ltr & 0x1) << 10;
> + reg |= (p_hevc->hier_qp_enable & 0x1) << 11;
> + reg |= (p_hevc->sign_data_hiding & 0x1) << 12;
> + reg |= (p_hevc->general_pb_enable & 0x1) << 13;
> + reg |= (p_hevc->temporal_id_enable & 0x1) << 14;
> + reg |= (p_hevc->strong_intra_smooth & 0x1) << 15;
> + reg |= (p_hevc->intra_pu_split_disable & 0x1) << 16;
> + reg |= (p_hevc->tmv_prediction_disable & 0x1) << 17;
> + reg |= (p_hevc->max_num_merge_mv & 0x7) << 18;
> + reg |= (0 << 21); /* always eco mode disable */
> + reg |= (p_hevc->encoding_nostartcode_enable & 0x1) << 22;
> + reg |= (p_hevc->prepend_sps_pps_to_idr << 26);
> +
> + writel(reg, mfc_regs->e_hevc_options);
> + /* refresh period */
> + if (p_hevc->refreshtype) {
> + reg = 0;
> + reg |= (p_hevc->refreshperiod & 0xFFFF);
> + writel(reg, mfc_regs->e_hevc_refresh_period);
> + }
> + /* loop filter setting */
> + if (!p_hevc->loopfilter_disable) {
> + reg = 0;
> + reg |= (p_hevc->lf_beta_offset_div2);
> + writel(reg, mfc_regs->e_hevc_lf_beta_offset_div2);
> + reg = 0;
> + reg |= (p_hevc->lf_tc_offset_div2);
> + writel(reg, mfc_regs->e_hevc_lf_tc_offset_div2);
> + }
> + /* long term reference */
> + if (p_hevc->enable_ltr) {
> + reg = 0;
> + reg |= (p_hevc->store_ref & 0x3);
> + reg &= ~(0x3 << 2);
> + reg |= (p_hevc->use_ref & 0x3) << 2;
> + writel(reg, mfc_regs->e_hevc_nal_control);
> + }
> + /* hier qp enable */
> + if (p_hevc->num_hier_layer) {
> + reg = 0;
> + reg |= (p_hevc->hier_qp_type & 0x1) << 0x3;
> + reg |= p_hevc->num_hier_layer & 0x7;
> + if (p_hevc->hier_ref_type) {
> + reg |= 0x1 << 7;
> + reg |= 0x3 << 4;
> + } else {
> + reg |= 0x7 << 4;
> + }
> + writel(reg, mfc_regs->e_num_t_layer);
> + /* QP value for each layer */
> + if (p_hevc->hier_qp_enable) {
> + for (i = 0; i < 7; i++)
> + writel(p_hevc->hier_qp_layer[i],
> + mfc_regs->e_hier_qp_layer0 + i * 4);
> + }
> + if (p->rc_frame) {
> + for (i = 0; i < 7; i++)
> + writel(p_hevc->hier_bit_layer[i],
> + mfc_regs->e_hier_bit_rate_layer0
> + + i * 4);
> + }
> + }
> +
> + /* rate control config. */
> + reg = readl(mfc_regs->e_rc_config);
> + /* macroblock level rate control */
> + reg &= ~(0x1 << 8);
> + reg |= (p->rc_mb << 8);
> + writel(reg, mfc_regs->e_rc_config);
> + /* frame QP */
> + reg &= ~(0x3F);
> + reg |= p_hevc->rc_frame_qp;
> + writel(reg, mfc_regs->e_rc_config);
> +
> + /* frame rate */
> + if (p->rc_frame) {
> + reg = 0;
> + reg &= ~(0xffff << 16);
> + reg |= ((p_hevc->rc_framerate * FRAME_DELTA_DEFAULT) << 16);
> + reg &= ~(0xffff);
> + reg |= FRAME_DELTA_DEFAULT;
> + writel(reg, mfc_regs->e_rc_frame_rate);
> + }
> +
> + /* max & min value of QP */
> + reg = 0;
> + /* max QP */
> + reg &= ~(0x3F << 8);
> + reg |= (p_hevc->rc_max_qp << 8);
> + /* min QP */
> + reg &= ~(0x3F);
> + reg |= p_hevc->rc_min_qp;
> + writel(reg, mfc_regs->e_rc_qp_bound);
> +
> + /* macroblock adaptive scaling features */
> + writel(0x0, mfc_regs->e_mb_rc_config);
> + if (p->rc_mb) {
> + reg = 0;
> + /* dark region */
> + reg &= ~(0x1 << 3);
> + reg |= (p_hevc->rc_lcu_dark << 3);
> + /* smooth region */
> + reg &= ~(0x1 << 2);
> + reg |= (p_hevc->rc_lcu_smooth << 2);
> + /* static region */
> + reg &= ~(0x1 << 1);
> + reg |= (p_hevc->rc_lcu_static << 1);
> + /* high activity region */
> + reg &= ~(0x1);
> + reg |= p_hevc->rc_lcu_activity;
> + writel(reg, mfc_regs->e_mb_rc_config);
> + }
> + writel(0x0, mfc_regs->e_fixed_picture_qp);
> + if (!p->rc_frame && !p->rc_mb) {
> + reg = 0;
> + reg &= ~(0x3f << 16);
> + reg |= (p_hevc->rc_b_frame_qp << 16);
> + reg &= ~(0x3f << 8);
> + reg |= (p_hevc->rc_p_frame_qp << 8);
> + reg &= ~(0x3f);
> + reg |= p_hevc->rc_frame_qp;
> + writel(reg, mfc_regs->e_fixed_picture_qp);
> + }
> + mfc_debug_leave();
> +
> + return 0;
> +}
> +
> /* Initialize decoding */
> static int s5p_mfc_init_decode_v6(struct s5p_mfc_ctx *ctx)
> {
> @@ -1552,6 +1740,8 @@ static int s5p_mfc_init_encode_v6(struct s5p_mfc_ctx *ctx)
> s5p_mfc_set_enc_params_h263(ctx);
> else if (ctx->codec_mode == S5P_MFC_CODEC_VP8_ENC)
> s5p_mfc_set_enc_params_vp8(ctx);
> + else if (ctx->codec_mode == S5P_FIMV_CODEC_HEVC_ENC)
> + s5p_mfc_set_enc_params_hevc(ctx);
> else {
> mfc_err("Unknown codec for encoding (%x).\n",
> ctx->codec_mode);
> @@ -2305,6 +2495,16 @@ static unsigned int s5p_mfc_get_crop_info_v_v6(struct s5p_mfc_ctx *ctx)
> R(d_static_buffer_addr, S5P_FIMV_D_STATIC_BUFFER_ADDR_V10);
> R(d_static_buffer_size, S5P_FIMV_D_STATIC_BUFFER_SIZE_V10);
>
> + /* encoder registers */
> + R(e_num_t_layer, S5P_FIMV_E_NUM_T_LAYER_V10);
> + R(e_hier_qp_layer0, S5P_FIMV_E_HIERARCHICAL_QP_LAYER0_V10);
> + R(e_hier_bit_rate_layer0, S5P_FIMV_E_HIERARCHICAL_BIT_RATE_LAYER0_V10);
> + R(e_hevc_options, S5P_FIMV_E_HEVC_OPTIONS_V10);
> + R(e_hevc_refresh_period, S5P_FIMV_E_HEVC_REFRESH_PERIOD_V10);
> + R(e_hevc_lf_beta_offset_div2, S5P_FIMV_E_HEVC_LF_BETA_OFFSET_DIV2_V10);
> + R(e_hevc_lf_tc_offset_div2, S5P_FIMV_E_HEVC_LF_TC_OFFSET_DIV2_V10);
> + R(e_hevc_nal_control, S5P_FIMV_E_HEVC_NAL_CONTROL_V10);
> +
> done:
> return &mfc_regs;
> #undef S5P_MFC_REG_ADDR
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> index 2290f7e..8a7d053 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
> @@ -46,6 +46,14 @@
> #define ENC_MPEG4_VOP_TIME_RES_MAX ((1 << 16) - 1)
> #define FRAME_DELTA_H264_H263 1
> #define TIGHT_CBR_MAX 10
> +#define ENC_HEVC_RC_FRAME_RATE_MAX ((1 << 16) - 1)
> +#define ENC_HEVC_QP_INDEX_MIN -12
> +#define ENC_HEVC_QP_INDEX_MAX 12
> +#define ENC_HEVC_LOOP_FILTER_MIN -12
> +#define ENC_HEVC_LOOP_FILTER_MAX 12
> +#define ENC_HEVC_LEVEL_MAX 62
> +
> +#define FRAME_DELTA_DEFAULT 1
>
> struct s5p_mfc_hw_ops *s5p_mfc_init_hw_ops_v6(void);
> const struct s5p_mfc_regs *s5p_mfc_init_regs_v6_plus(struct s5p_mfc_dev *dev);
More information about the linux-arm-kernel
mailing list