Merge "msm: vidc: Fix scaling capability for encoders"

This commit is contained in:
qctecmdr 2019-07-12 19:30:35 -07:00 committed by Gerrit - the friendly Code Review server
commit ac0ba4c8f7

View File

@ -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},