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

Commit 136c9e2e 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: Remove PQ extradata support"

parents e84eb9d5 5ebc2662

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -675,7 +675,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.name = "Extradata Type",

		.name = "Extradata Type",

		.type = V4L2_CTRL_TYPE_MENU,

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_ROI_QP,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -695,8 +695,7 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_LTR) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_METADATA_MBI) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS)|

			(1 << V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS)|

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_ROI_QP)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO)

			),

			),

		.qmenu = mpeg_video_vidc_extradata,

		.qmenu = mpeg_video_vidc_extradata,

	},

	},