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

Commit 63b519e5 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: Add support to request frame bits info as extra-data"

parents e4c7508a ecf08ebe

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

+3 −0
Original line number Diff line number Diff line
@@ -379,6 +379,9 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_FRAME_QP:

		ret = HFI_PROPERTY_PARAM_VDEC_FRAME_QP_EXTRADATA;

		break;

	case HAL_EXTRADATA_FRAME_BITS_INFO:

		ret = HFI_PROPERTY_PARAM_VDEC_FRAME_BITS_INFO_EXTRADATA;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata index not found: %d\n", index);

		break;

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

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

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -276,7 +276,8 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_INDEX_EXTRADATA_ASPECT_RATIO) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_MPEG2_SEQDISP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_STREAM_USERDATA) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO)

			),

		.qmenu = mpeg_video_vidc_extradata,

		.step = 0,

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

+3 −0
Original line number Diff line number Diff line
@@ -3206,6 +3206,9 @@ enum hal_extradata_id msm_comm_get_hal_extradata_index( 
	case V4L2_MPEG_VIDC_EXTRADATA_FRAME_QP:

		ret = HAL_EXTRADATA_FRAME_QP;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO:

		ret = HAL_EXTRADATA_FRAME_BITS_INFO;

		break;

	default:

		dprintk(VIDC_WARN, "Extradata not found: %d\n", index);

		break;

drivers/media/platform/msm/vidc/vidc_hfi.h

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
#define HFI_EXTRADATA_MPEG2_SEQDISP		0x0000000D

#define HFI_EXTRADATA_STREAM_USERDATA		0x0000000E

#define HFI_EXTRADATA_FRAME_QP			0x0000000F

#define HFI_EXTRADATA_FRAME_BITS_INFO		0x00000010

#define HFI_EXTRADATA_MULTISLICE_INFO		0x7F100000

#define HFI_EXTRADATA_NUM_CONCEALED_MB		0x7F100001

#define HFI_EXTRADATA_INDEX					0x7F100002
@@ -202,6 +203,8 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x017)

#define HFI_PROPERTY_PARAM_VDEC_FRAME_QP_EXTRADATA \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x018)

#define HFI_PROPERTY_PARAM_VDEC_FRAME_BITS_INFO_EXTRADATA \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x019)

#define HFI_PROPERTY_PARAM_VDEC_SCS_THRESHOLD \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x01A)

drivers/media/platform/msm/vidc/vidc_hfi_api.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ enum hal_extradata_id { 
	HAL_EXTRADATA_MPEG2_SEQDISP,

	HAL_EXTRADATA_STREAM_USERDATA,

	HAL_EXTRADATA_FRAME_QP,

	HAL_EXTRADATA_FRAME_BITS_INFO,

};



enum hal_property {