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

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

Merge "msm-vidc: update decoder scaling capability"

parents 154af16c 9734cff1

msm/vidc/msm_vidc_platform.c

+12 −6
Original line number Diff line number Diff line
@@ -167,8 +167,10 @@ static struct msm_vidc_codec_capability lito_capabilities_v0[] = { 
	{CAP_MBS_PER_SECOND, DOMAINS_ALL, CODECS_ALL, 36, 3110400, 1, 2073600},

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

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

	{CAP_SCALE_X, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{CAP_SCALE_Y, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{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},
@@ -230,8 +232,10 @@ static struct msm_vidc_codec_capability lito_capabilities_v1[] = { 
	{CAP_MBS_PER_SECOND, DOMAINS_ALL, CODECS_ALL, 36, 1281600, 1, 2073600},

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

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

	{CAP_SCALE_X, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{CAP_SCALE_Y, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{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},
@@ -293,8 +297,10 @@ static struct msm_vidc_codec_capability kona_capabilities[] = { 
	{CAP_MBS_PER_SECOND, DOMAINS_ALL, CODECS_ALL, 64, 7833600, 1, 7833600},

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

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

	{CAP_SCALE_X, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, DOMAINS_ALL, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096},

	{CAP_SCALE_X, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{CAP_SCALE_Y, DEC, CODECS_ALL, 65536, 65536, 1, 65536},

	{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, 2, 1, 0},