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

Commit 9d98549c 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: Send resolution along with output buffer"

parents 5ec8d19f 772ebaf5

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

+4 −0
Original line number Diff line number Diff line
@@ -1503,6 +1503,10 @@ static void handle_fbd(enum command_response cmd, void *data) 
		vb->v4l2_planes[0].reserved[3] = fill_buf_done->start_y_coord;

		vb->v4l2_planes[0].reserved[4] = fill_buf_done->frame_width;

		vb->v4l2_planes[0].reserved[5] = fill_buf_done->frame_height;

		vb->v4l2_planes[0].reserved[6] =

			inst->prop.width[CAPTURE_PORT];

		vb->v4l2_planes[0].reserved[7] =

			inst->prop.height[CAPTURE_PORT];

		if (vb->v4l2_planes[0].data_offset > vb->v4l2_planes[0].length)

			dprintk(VIDC_INFO,

				"fbd:Overflow data_offset = %d; length = %d\n",

include/uapi/linux/msm_vidc_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ struct vdec_output_frameinfo { 
	enum vdec_picture pic_type;

	void *client_data;

	void *input_frame_clientdata;

	struct vdec_picsize picsize;

	struct vdec_framesize framesize;

	enum vdec_interlaced_format interlaced_format;

	struct vdec_aspectratioinfo aspect_ratio_info;