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

Commit 9c237873 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: replace P010 with P010_Venus"

parents e1610d03 d92f6fac

drivers/media/platform/msm/vidc/msm_vdec.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ struct msm_vidc_format vdec_formats[] = { 
	{

		.name = "YCbCr Semiplanar 4:2:0 10bit",

		.description = "Y/CbCr 4:2:0 10bit",

		.fourcc = V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010,

		.fourcc = V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS,

		.get_frame_size = get_frame_size_p010,

		.type = CAPTURE_PORT,

	},

drivers/media/platform/msm/vidc/msm_venc.c

+1 −1
Original line number Diff line number Diff line
@@ -1191,7 +1191,7 @@ static struct msm_vidc_format venc_formats[] = { 
	{

		.name = "YCbCr Semiplanar 4:2:0 10bit",

		.description = "Y/CbCr 4:2:0 10bit",

		.fourcc = V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010,

		.fourcc = V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS,

		.get_frame_size = get_frame_size_p010,

		.type = OUTPUT_PORT,

	},

drivers/media/platform/msm/vidc/msm_vidc.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ int msm_vidc_g_fmt(void *instance, struct v4l2_format *f) 
	case V4L2_PIX_FMT_NV12_TP10_UBWC:

		color_format = COLOR_FMT_NV12_BPP10_UBWC;

		break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010:

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS:

		color_format = COLOR_FMT_P010;

		break;

	default:

drivers/media/platform/msm/vidc/msm_vidc_common.c

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ enum hal_uncompressed_format msm_comm_get_hal_uncompressed(int fourcc) 
	case V4L2_PIX_FMT_NV12_TP10_UBWC:

		format = HAL_COLOR_FORMAT_NV12_TP10_UBWC;

		break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010:

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS:

		format = HAL_COLOR_FORMAT_P010;

		break;

	default:

drivers/media/v4l2-core/v4l2-ioctl.c

+2 −0
Original line number Diff line number Diff line
@@ -1319,6 +1319,8 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt) 
					descr = "Y/CbCr 4:2:0 TP10"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010:

					descr = "Y/CbCr 4:2:0 P10"; break;

	case V4L2_PIX_FMT_SDE_Y_CBCR_H2V2_P010_VENUS:

					descr = "Y/CbCr 4:2:0 P10 Venus"; break;

	case V4L2_PIX_FMT_NV12_TP10_UBWC:

					descr = "Y/CbCr 4:2:0 TP10 UBWC"; break;

	case V4L2_PIX_FMT_NV12_P010_UBWC: