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

Commit 4e6bb2a5 authored by Kamil Debski's avatar Kamil Debski Committed by Mauro Carvalho Chehab
Browse files

[media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism 



Fixed the code copying timecode/timestamp to corresponding
frames between OUTPUT and CAPTURE.

Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cba5d0b2

drivers/media/video/s5p-mfc/regs-mfc.h

+5 −0
Original line number Diff line number Diff line
@@ -164,10 +164,15 @@ 
								decoded pic */

#define S5P_FIMV_SI_DISPLAY_Y_ADR	0x2010 /* luma addr of displayed pic */

#define S5P_FIMV_SI_DISPLAY_C_ADR	0x2014 /* chroma addrof displayed pic */



#define S5P_FIMV_SI_CONSUMED_BYTES	0x2018 /* Consumed number of bytes to

							decode a frame */

#define S5P_FIMV_SI_DISPLAY_STATUS	0x201c /* status of decoded picture */



#define S5P_FIMV_SI_DECODE_Y_ADR	0x2024 /* luma addr of decoded pic */

#define S5P_FIMV_SI_DECODE_C_ADR	0x2028 /* chroma addrof decoded pic */

#define S5P_FIMV_SI_DECODE_STATUS	0x202c /* status of decoded picture */



#define S5P_FIMV_SI_CH0_SB_ST_ADR	0x2044 /* start addr of stream buf */

#define S5P_FIMV_SI_CH0_SB_FRM_SIZE	0x2048 /* size of stream buf */

#define S5P_FIMV_SI_CH0_DESC_ADR	0x204c /* addr of descriptor buf */

drivers/media/video/s5p-mfc/s5p_mfc_opr.h

+3 −1
Original line number Diff line number Diff line
@@ -57,10 +57,12 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq); 
					S5P_FIMV_SI_DISPLAY_Y_ADR) << \

					MFC_OFFSET_SHIFT)

#define s5p_mfc_get_dec_y_adr()		(readl(dev->regs_base + \

					S5P_FIMV_SI_DISPLAY_Y_ADR) << \

					S5P_FIMV_SI_DECODE_Y_ADR) << \

					MFC_OFFSET_SHIFT)

#define s5p_mfc_get_dspl_status()	readl(dev->regs_base + \

						S5P_FIMV_SI_DISPLAY_STATUS)

#define s5p_mfc_get_dec_status()	readl(dev->regs_base + \

						S5P_FIMV_SI_DECODE_STATUS)

#define s5p_mfc_get_frame_type()	(readl(dev->regs_base + \

						S5P_FIMV_DECODE_FRAME_TYPE) \

					& S5P_FIMV_DECODE_FRAME_MASK)