Merge "msm-vidc: Update capabilities for VP8 codec" (8daa6110) · Commits · e / devices / android_kernel_fairphone_FP4

msm/vidc/msm_vidc_platform.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -187,14 +187,14 @@ static struct msm_vidc_codec_capability lito_capabilities_v0[] = {
		{CAP_MAX_VIDEOCORES, DOMAINS_ALL, CODECS_ALL, 0, 1, 1, 1},

		/* VP8 specific */
		{CAP_FRAME_WIDTH, ENC\|DEC, VP8, 96, 1920, 1, 1920},
		{CAP_FRAME_HEIGHT, ENC\|DEC, VP8, 96, 1920, 1, 1080},
		/* (1920 * 1088) / 256 */
		{CAP_MBS_PER_FRAME, ENC\|DEC, VP8, 36, 8160, 1, 8160},
		/* ((1920 * 1088) / 256) * 120*/
		{CAP_MBS_PER_SECOND, ENC\|DEC, VP8, 36, 979200, 1, 244800},
		{CAP_FRAMERATE, ENC\|DEC, VP8, 1, 120, 1, 30},
		{CAP_BITRATE, ENC, VP8, 1, 40000000, 1, 20000000},
		{CAP_FRAME_WIDTH, ENC\|DEC, VP8, 96, 4096, 1, 1920},
		{CAP_FRAME_HEIGHT, ENC\|DEC, VP8, 96, 4096, 1, 1080},
		/* (4096 * 2160) / 256 */
		{CAP_MBS_PER_FRAME, ENC\|DEC, VP8, 36, 34560, 1, 8160},
		/* (4096 * 2160) / 256) * 30*/
		{CAP_MBS_PER_SECOND, ENC\|DEC, VP8, 36, 1036800, 1, 244800},
		{CAP_FRAMERATE, ENC\|DEC, VP8, 1, 30, 1, 30},
		{CAP_BITRATE, ENC, VP8, 1, 100000000, 1, 20000000},
		{CAP_BITRATE, DEC, VP8, 1, 100000000, 1, 20000000},

		/* Mpeg2 decoder specific */
		@@ -254,9 +254,9 @@ static struct msm_vidc_codec_capability lito_capabilities_v1[] = {
		{CAP_FRAME_HEIGHT, ENC\|DEC, VP8, 96, 1920, 1, 1080},
		/* (1920 * 1088) / 256 */
		{CAP_MBS_PER_FRAME, ENC\|DEC, VP8, 36, 8160, 1, 8160},
		/* ((1920 * 1088) / 256) * 120*/
		{CAP_MBS_PER_SECOND, ENC\|DEC, VP8, 36, 979200, 1, 244800},
		{CAP_FRAMERATE, ENC\|DEC, VP8, 1, 120, 1, 30},
		/* ((1920 * 1088) / 256) * 60*/
		{CAP_MBS_PER_SECOND, ENC\|DEC, VP8, 36, 489600, 1, 244800},
		{CAP_FRAMERATE, ENC\|DEC, VP8, 1, 60, 1, 30},
		{CAP_BITRATE, ENC, VP8, 1, 40000000, 1, 20000000},
		{CAP_BITRATE, DEC, VP8, 1, 100000000, 1, 20000000},