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

Commit 4bde172f authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "vidc_3x: Fix IDR control setting issue"

parents d7525bdb 94396172

include/uapi/linux/v4l2-controls.h

+0 −1
Original line number Diff line number Diff line
@@ -815,7 +815,6 @@ enum v4l2_mpeg_vidc_video_stream_format { 
};



#define V4L2_CID_MPEG_VIDC_VIDEO_DECODE_ORDER   (V4L2_CID_MPEG_MSM_VIDC_BASE+3)

#define V4L2_CID_MPEG_VIDC_VIDEO_IDR_PERIOD   (V4L2_CID_MPEG_MSM_VIDC_BASE+5)

#define V4L2_CID_MPEG_VIDC_VIDEO_NUM_P_FRAMES (V4L2_CID_MPEG_MSM_VIDC_BASE+6)

#define V4L2_CID_MPEG_VIDC_VIDEO_NUM_B_FRAMES (V4L2_CID_MPEG_MSM_VIDC_BASE+7)

#define V4L2_CID_MPEG_VIDC_VIDEO_REQUEST_IFRAME (V4L2_CID_MPEG_MSM_VIDC_BASE+8)

include/uapi/media/msm_vidc.h

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ static inline unsigned int VENUS_EXTRADATA_SIZE(int width, int height) 
	return 16 * 1024;

}



#define V4L2_CID_MPEG_VIDC_VIDEO_IDR_PERIOD   (V4L2_CID_MPEG_MSM_VIDC_BASE+5)



#define V4L2_CID_MPEG_VIDC_VIDEO_STREAM_OUTPUT_MODE \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 22)

enum v4l2_mpeg_vidc_video_decoder_multi_stream {