From b77f91e4fbdb84500f1123200b733d99a7f95643 Mon Sep 17 00:00:00 2001 From: Vikash Garodia Date: Mon, 8 Jul 2019 13:33:47 +0530 Subject: [PATCH] msm: vidc: Fix scaling capability for encoders Scaling capability are defined in Q16 format. Existing capability indicates that the capability is 16 times i.e output dimension can be scaled to 1/16th of input dimension. As per specification, the achievable ratio is 8. Change-Id: Ib9e005a055e604d3173dd8cd376d3b6666f2c12c Signed-off-by: Vikash Garodia --- msm/vidc/msm_vidc_platform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/msm/vidc/msm_vidc_platform.c b/msm/vidc/msm_vidc_platform.c index c98973d52173..eaf20bb9fe4a 100644 --- a/msm/vidc/msm_vidc_platform.c +++ b/msm/vidc/msm_vidc_platform.c @@ -167,8 +167,8 @@ 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, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, - {CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, + {CAP_SCALE_X, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, + {CAP_SCALE_Y, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, {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}, @@ -232,8 +232,8 @@ 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, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, - {CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, + {CAP_SCALE_X, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, + {CAP_SCALE_Y, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, {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}, @@ -297,8 +297,8 @@ 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, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, - {CAP_SCALE_Y, ENC, CODECS_ALL, 4096, 65536, 1, 4096}, + {CAP_SCALE_X, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, + {CAP_SCALE_Y, ENC, CODECS_ALL, 8192, 65536, 1, 8192}, {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},