diff options
author | Kamil Debski <k.debski@samsung.com> | 2012-06-08 03:46:38 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-06-18 18:44:46 -0400 |
commit | 4e6bb2a5fb9265a222e3a86b215f4c5e6bcd61de (patch) | |
tree | bba2da01b85fe52dc6728d01c767bfc3beba7377 /drivers/media | |
parent | cba5d0b20e7c75dc06e3a609059f17f11c843d94 (diff) |
[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: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/s5p-mfc/regs-mfc.h | 5 | ||||
-rw-r--r-- | drivers/media/video/s5p-mfc/s5p_mfc_opr.h | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/media/video/s5p-mfc/regs-mfc.h b/drivers/media/video/s5p-mfc/regs-mfc.h index 053a8a872fd..a19bece41ba 100644 --- a/drivers/media/video/s5p-mfc/regs-mfc.h +++ b/drivers/media/video/s5p-mfc/regs-mfc.h | |||
@@ -164,10 +164,15 @@ | |||
164 | decoded pic */ | 164 | decoded pic */ |
165 | #define S5P_FIMV_SI_DISPLAY_Y_ADR 0x2010 /* luma addr of displayed pic */ | 165 | #define S5P_FIMV_SI_DISPLAY_Y_ADR 0x2010 /* luma addr of displayed pic */ |
166 | #define S5P_FIMV_SI_DISPLAY_C_ADR 0x2014 /* chroma addrof displayed pic */ | 166 | #define S5P_FIMV_SI_DISPLAY_C_ADR 0x2014 /* chroma addrof displayed pic */ |
167 | |||
167 | #define S5P_FIMV_SI_CONSUMED_BYTES 0x2018 /* Consumed number of bytes to | 168 | #define S5P_FIMV_SI_CONSUMED_BYTES 0x2018 /* Consumed number of bytes to |
168 | decode a frame */ | 169 | decode a frame */ |
169 | #define S5P_FIMV_SI_DISPLAY_STATUS 0x201c /* status of decoded picture */ | 170 | #define S5P_FIMV_SI_DISPLAY_STATUS 0x201c /* status of decoded picture */ |
170 | 171 | ||
172 | #define S5P_FIMV_SI_DECODE_Y_ADR 0x2024 /* luma addr of decoded pic */ | ||
173 | #define S5P_FIMV_SI_DECODE_C_ADR 0x2028 /* chroma addrof decoded pic */ | ||
174 | #define S5P_FIMV_SI_DECODE_STATUS 0x202c /* status of decoded picture */ | ||
175 | |||
171 | #define S5P_FIMV_SI_CH0_SB_ST_ADR 0x2044 /* start addr of stream buf */ | 176 | #define S5P_FIMV_SI_CH0_SB_ST_ADR 0x2044 /* start addr of stream buf */ |
172 | #define S5P_FIMV_SI_CH0_SB_FRM_SIZE 0x2048 /* size of stream buf */ | 177 | #define S5P_FIMV_SI_CH0_SB_FRM_SIZE 0x2048 /* size of stream buf */ |
173 | #define S5P_FIMV_SI_CH0_DESC_ADR 0x204c /* addr of descriptor buf */ | 178 | #define S5P_FIMV_SI_CH0_DESC_ADR 0x204c /* addr of descriptor buf */ |
diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h index db83836e6a9..5932d1c782c 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_opr.h +++ b/drivers/media/video/s5p-mfc/s5p_mfc_opr.h | |||
@@ -57,10 +57,12 @@ void s5p_mfc_cleanup_queue(struct list_head *lh, struct vb2_queue *vq); | |||
57 | S5P_FIMV_SI_DISPLAY_Y_ADR) << \ | 57 | S5P_FIMV_SI_DISPLAY_Y_ADR) << \ |
58 | MFC_OFFSET_SHIFT) | 58 | MFC_OFFSET_SHIFT) |
59 | #define s5p_mfc_get_dec_y_adr() (readl(dev->regs_base + \ | 59 | #define s5p_mfc_get_dec_y_adr() (readl(dev->regs_base + \ |
60 | S5P_FIMV_SI_DISPLAY_Y_ADR) << \ | 60 | S5P_FIMV_SI_DECODE_Y_ADR) << \ |
61 | MFC_OFFSET_SHIFT) | 61 | MFC_OFFSET_SHIFT) |
62 | #define s5p_mfc_get_dspl_status() readl(dev->regs_base + \ | 62 | #define s5p_mfc_get_dspl_status() readl(dev->regs_base + \ |
63 | S5P_FIMV_SI_DISPLAY_STATUS) | 63 | S5P_FIMV_SI_DISPLAY_STATUS) |
64 | #define s5p_mfc_get_dec_status() readl(dev->regs_base + \ | ||
65 | S5P_FIMV_SI_DECODE_STATUS) | ||
64 | #define s5p_mfc_get_frame_type() (readl(dev->regs_base + \ | 66 | #define s5p_mfc_get_frame_type() (readl(dev->regs_base + \ |
65 | S5P_FIMV_DECODE_FRAME_TYPE) \ | 67 | S5P_FIMV_DECODE_FRAME_TYPE) \ |
66 | & S5P_FIMV_DECODE_FRAME_MASK) | 68 | & S5P_FIMV_DECODE_FRAME_MASK) |