Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 560a14de authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Update capabilities for bengal"

parents 3f4cee40 a4391c04

msm/vidc/msm_vidc_platform.c

+3 −9
Original line number Diff line number Diff line
@@ -105,12 +105,8 @@ static struct msm_vidc_codec_data sm6150_codec_data[] = { 
static struct msm_vidc_codec_data bengal_codec_data[] =  {

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_ENCODER, 125, 675, 320),

	CODEC_ENTRY(V4L2_PIX_FMT_TME, MSM_VIDC_ENCODER, 0, 540, 540),

	CODEC_ENTRY(V4L2_PIX_FMT_MPEG2, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_H264, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_HEVC, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP8, MSM_VIDC_DECODER, 50, 200, 200),

	CODEC_ENTRY(V4L2_PIX_FMT_VP9, MSM_VIDC_DECODER, 50, 200, 200),

};
@@ -369,13 +365,12 @@ static struct msm_vidc_codec_capability bengal_capabilities[] = { 
	/* {cap_type, domains, codecs, min, max, step_size, default_value} */

	{CAP_FRAME_WIDTH, DOMAINS_ALL, CODECS_ALL, 96, 1920, 1, 1920},

	{CAP_FRAME_HEIGHT, DOMAINS_ALL, CODECS_ALL, 96, 1920, 1, 1080},

	/*  ((1920 * 1080) / 256) */

	{CAP_MBS_PER_FRAME, DOMAINS_ALL, CODECS_ALL, 36, 8160, 1, 34560},

	/*  ((1920 * 1088) / 256) */

	{CAP_MBS_PER_FRAME, DOMAINS_ALL, CODECS_ALL, 36, 8160, 1, 8160},

	/* 1080@30 decode + 1080@30 encode */

	{CAP_MBS_PER_SECOND, DOMAINS_ALL, CODECS_ALL, 36, 486000, 1, 243000},

	{CAP_FRAMERATE, DOMAINS_ALL, CODECS_ALL, 1, 120, 1, 30},

	{CAP_BITRATE, DOMAINS_ALL, CODECS_ALL, 1, 40000000, 1, 20000000},

	{CAP_BFRAME, ENC, H264|HEVC, 0, 1, 1, 0},

	{CAP_HIER_P_NUM_ENH_LAYERS, ENC, H264|HEVC, 0, 6, 1, 0},

	{CAP_LTR_COUNT, ENC, H264|HEVC, 0, 4, 1, 0},

	/* ((1920 * 1088) / 256) * 30 fps */
@@ -383,7 +378,6 @@ static struct msm_vidc_codec_capability bengal_capabilities[] = { 
		0, 244800, 1, 244800},

	{CAP_I_FRAME_QP, ENC, H264|HEVC, 0, 51, 1, 10},

	{CAP_P_FRAME_QP, ENC, H264|HEVC, 0, 51, 1, 20},

	{CAP_B_FRAME_QP, ENC, H264|HEVC, 0, 51, 1, 20},



	/* 10 slices */

	{CAP_SLICE_BYTE, ENC, H264|HEVC, 1, 10, 1, 10},
@@ -394,7 +388,7 @@ static struct msm_vidc_codec_capability bengal_capabilities[] = { 
	{CAP_SECURE_FRAME_WIDTH, DOMAINS_ALL, CODECS_ALL, 96, 1920, 1, 1920},

	{CAP_SECURE_FRAME_HEIGHT, DOMAINS_ALL, CODECS_ALL, 96, 1920, 1, 1080},

	/* (1920 * 1088) / 256 */

	{CAP_SECURE_MBS_PER_FRAME, DOMAINS_ALL, CODECS_ALL, 36, 8160, 1, 34560},

	{CAP_SECURE_MBS_PER_FRAME, DOMAINS_ALL, CODECS_ALL, 36, 8160, 1, 8160},

	{CAP_SECURE_BITRATE, DOMAINS_ALL, CODECS_ALL, 1, 40000000, 1, 20000000},

};