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

Commit 4c2755d9 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 for VQZIP SEI extradata for decoders"

parents 98df6e9e f49c5241

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

+4 −2
Original line number Diff line number Diff line
@@ -551,6 +551,9 @@ static int get_hfi_extradata_index(enum hal_extradata_id index) 
	case HAL_EXTRADATA_METADATA_MBI:

		ret = HFI_PROPERTY_PARAM_VENC_MBI_DUMPING;

		break;

	case HAL_EXTRADATA_VQZIP_SEI:

		ret = HFI_PROPERTY_PARAM_VDEC_VQZIP_SEI_EXTRADATA;

		break;

	default:

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

		break;
@@ -1623,8 +1626,7 @@ int create_pkt_cmd_session_set_property( 
		int id = 0;

		pkt->rg_property_data[0] =

			get_hfi_extradata_index(extra->index);

		hfi =

			(struct hfi_index_extradata_config *)

		hfi = (struct hfi_index_extradata_config *)

			&pkt->rg_property_data[1];

		hfi->enable = extra->enable;

		id = get_hfi_extradata_id(extra->index);

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

+7 −2
Original line number Diff line number Diff line
@@ -67,6 +67,10 @@ static const char *const mpeg_video_vidc_extradata[] = { 
	"Extradata digital zoom",

	"Extradata aspect ratio",

	"Extradata mpeg2 seqdisp",

	"Extradata stream userdata",

	"Extradata frame QP",

	"Extradata frame bits info",

	"Extradata VQZip SEI",

};

static const char *const mpeg_vidc_video_alloc_mode_type[] = {

	"Buffer Allocation Static",
@@ -262,7 +266,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_BITS_INFO,

		.maximum = V4L2_MPEG_VIDC_EXTRADATA_VQZIP_SEI,

		.default_value = V4L2_MPEG_VIDC_EXTRADATA_NONE,

		.menu_skip_mask = ~(

			(1 << V4L2_MPEG_VIDC_EXTRADATA_NONE) |
@@ -284,7 +288,8 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(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_BITS_INFO)

			(1 << V4L2_MPEG_VIDC_EXTRADATA_FRAME_BITS_INFO) |

			(1 << V4L2_MPEG_VIDC_EXTRADATA_VQZIP_SEI)

			),

		.qmenu = mpeg_video_vidc_extradata,

	},

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

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

		ret = HAL_EXTRADATA_METADATA_MBI;

		break;

	case V4L2_MPEG_VIDC_EXTRADATA_VQZIP_SEI:

		ret = HAL_EXTRADATA_VQZIP_SEI;

		break;

	default:

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

		break;

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

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ struct hfi_extradata_header { 
	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x019)

#define HFI_PROPERTY_PARAM_VDEC_SCS_THRESHOLD \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x01A)

#define HFI_PROPERTY_PARAM_VUI_DISPLAY_INFO_EXTRADATA \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x01B)

#define HFI_PROPERTY_PARAM_VDEC_VQZIP_SEI_EXTRADATA \

	(HFI_PROPERTY_PARAM_VDEC_OX_START + 0x001C)



#define HFI_PROPERTY_CONFIG_VDEC_OX_START				\

	(HFI_DOMAIN_BASE_VDEC + HFI_ARCH_OX_OFFSET + 0x0000)

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

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

	HAL_EXTRADATA_LTR_INFO,

	HAL_EXTRADATA_METADATA_MBI,

	HAL_EXTRADATA_VQZIP_SEI,

};



enum hal_property {