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

Commit 6474cf65 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: Support multiple misr values per frame"

parents 791125d2 98007b2b

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

+0 −22
Original line number Diff line number Diff line
@@ -173,28 +173,6 @@ struct msm_vidc_input_crop_payload { 
	unsigned int height;

};



struct msm_vidc_misr_info {

	unsigned int misr_dpb_luma;

	unsigned int misr_dpb_chroma;

	unsigned int misr_opb_luma;

	unsigned int misr_opb_chroma;

};

struct msm_vidc_output_crop_payload {

	unsigned int size;

	unsigned int version;

	unsigned int port_index;

	unsigned int left;

	unsigned int top;

	unsigned int display_width;

	unsigned int display_height;

	unsigned int width;

	unsigned int height;

	unsigned int frame_num;

	unsigned int bit_depth_y;

	unsigned int bit_depth_c;

	struct msm_vidc_misr_info misr_info[2];

};



struct msm_vidc_extradata_index {

	unsigned int type;

	union {

include/uapi/media/msm_vidc_utils.h

+5 −4
Original line number Diff line number Diff line
@@ -67,10 +67,11 @@ struct msm_vidc_input_crop_payload { 
};



struct msm_vidc_misr_info {

	unsigned int misr_dpb_luma;

	unsigned int misr_dpb_chroma;

	unsigned int misr_opb_luma;

	unsigned int misr_opb_chroma;

	unsigned int misr_set;

	unsigned int misr_dpb_luma[8];

	unsigned int misr_dpb_chroma[8];

	unsigned int misr_opb_luma[8];

	unsigned int misr_opb_chroma[8];

};

struct msm_vidc_output_crop_payload {

	unsigned int size;