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

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

Merge "msm: vidc: Add support for 16K HEIF encode"

parents 3dc916d2 168e116f
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -1041,17 +1041,17 @@ struct msm_vidc_format_constraint enc_pix_format_constraints[] = {
	{
		.fourcc = V4L2_PIX_FMT_NV12_512,
		.num_planes = 2,
		.y_max_stride = 8192,
		.y_max_stride = 16384,
		.y_buffer_alignment = 512,
		.uv_max_stride = 8192,
		.uv_max_stride = 16384,
		.uv_buffer_alignment = 256,
	},
	{
		.fourcc = V4L2_PIX_FMT_NV12,
		.num_planes = 2,
		.y_max_stride = 8192,
		.y_max_stride = 16384,
		.y_buffer_alignment = 512,
		.uv_max_stride = 8192,
		.uv_max_stride = 16384,
		.uv_buffer_alignment = 256,
	},
	{
+2 −2
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ static struct msm_vidc_codec_capability kona_capabilities[] = {
	/* Image specific */
	{CAP_HEVC_IMAGE_FRAME_WIDTH, ENC, HEVC, 128, 512, 1, 512},
	{CAP_HEVC_IMAGE_FRAME_HEIGHT, ENC, HEVC, 128, 512, 1, 512},
	{CAP_HEIC_IMAGE_FRAME_WIDTH, ENC, HEVC, 512, 8192, 1, 8192},
	{CAP_HEIC_IMAGE_FRAME_HEIGHT, ENC, HEVC, 512, 8192, 1, 8192},
	{CAP_HEIC_IMAGE_FRAME_WIDTH, ENC, HEVC, 512, 16384, 1, 16384},
	{CAP_HEIC_IMAGE_FRAME_HEIGHT, ENC, HEVC, 512, 16384, 1, 16384},
};

/*