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

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

Merge "msm: vidc: Update profile level as per lagoon spec"

parents 11e7a283 c929cb83

msm/vidc/msm_vidc_platform.c

+16 −16
Original line number Diff line number Diff line
@@ -480,19 +480,19 @@ static struct msm_vidc_codec_capability lagoon_capabilities_v0[] = { 
	 *  to set higher level than supported

	 */

	{CAP_H264_LEVEL, ENC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_0, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_0},

				V4L2_MPEG_VIDEO_H264_LEVEL_5_1, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_4_0},

	{CAP_HEVC_LEVEL, ENC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6},

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_4},



	/* Level for AVC and HEVC decoder specific */

	{CAP_H264_LEVEL, DEC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_1, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_5_0},

				V4L2_MPEG_VIDEO_H264_LEVEL_5_2, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_4_0},

	{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5},

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5_1, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_4},

};



static struct msm_vidc_codec_capability lagoon_capabilities_v1[] = {
@@ -572,19 +572,19 @@ static struct msm_vidc_codec_capability lagoon_capabilities_v1[] = { 
	 *  to set higher level than supported

	 */

	{CAP_H264_LEVEL, ENC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_0, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_0},

				V4L2_MPEG_VIDEO_H264_LEVEL_5_1, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_4_0},

	{CAP_HEVC_LEVEL, ENC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6},

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_4},



	/* Level for AVC and HEVC decoder specific */

	{CAP_H264_LEVEL, DEC, H264, V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

				V4L2_MPEG_VIDEO_H264_LEVEL_6_1, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_5_0},

				V4L2_MPEG_VIDEO_H264_LEVEL_5_1, 1,

				V4L2_MPEG_VIDEO_H264_LEVEL_4_0},

	{CAP_HEVC_LEVEL, DEC, HEVC, V4L2_MPEG_VIDEO_HEVC_LEVEL_1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_6_1, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5},

				V4L2_MPEG_VIDEO_HEVC_LEVEL_5, 1,

				V4L2_MPEG_VIDEO_HEVC_LEVEL_4},

};



static struct msm_vidc_codec_capability bengal_capabilities_v0[] = {