diff options
| -rw-r--r-- | drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 13 | ||||
| -rw-r--r-- | drivers/staging/media/sunxi/cedrus/cedrus_dec.h | 2 | ||||
| -rw-r--r-- | drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c | 10 |
3 files changed, 4 insertions, 21 deletions
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c index 2c295286766c..443fb037e1cf 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.c @@ -22,19 +22,6 @@ #include "cedrus_dec.h" #include "cedrus_hw.h" -int cedrus_reference_index_find(struct vb2_queue *queue, - struct vb2_buffer *vb2_buf, u64 timestamp) -{ - /* - * Allow using the current capture buffer as reference, which can occur - * for field-coded pictures. - */ - if (vb2_buf->timestamp == timestamp) - return vb2_buf->index; - else - return vb2_find_timestamp(queue, timestamp, 0); -} - void cedrus_device_run(void *priv) { struct cedrus_ctx *ctx = priv; diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_dec.h b/drivers/staging/media/sunxi/cedrus/cedrus_dec.h index 8d0fc248220f..d1ae7903677b 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_dec.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus_dec.h @@ -16,8 +16,6 @@ #ifndef _CEDRUS_DEC_H_ #define _CEDRUS_DEC_H_ -int cedrus_reference_index_find(struct vb2_queue *queue, - struct vb2_buffer *vb2_buf, u64 timestamp); void cedrus_device_run(void *priv); #endif diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c index 81c66a8aa1ac..cb45fda9aaeb 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c @@ -10,7 +10,6 @@ #include <media/videobuf2-dma-contig.h> #include "cedrus.h" -#include "cedrus_dec.h" #include "cedrus_hw.h" #include "cedrus_regs.h" @@ -160,8 +159,8 @@ static void cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run) cedrus_write(dev, VE_DEC_MPEG_PICBOUNDSIZE, reg); /* Forward and backward prediction reference buffers. */ - forward_idx = cedrus_reference_index_find(cap_q, &run->dst->vb2_buf, - slice_params->forward_ref_ts); + forward_idx = vb2_find_timestamp(cap_q, + slice_params->forward_ref_ts, 0); fwd_luma_addr = cedrus_dst_buf_addr(ctx, forward_idx, 0); fwd_chroma_addr = cedrus_dst_buf_addr(ctx, forward_idx, 1); @@ -169,9 +168,8 @@ static void cedrus_mpeg2_setup(struct cedrus_ctx *ctx, struct cedrus_run *run) cedrus_write(dev, VE_DEC_MPEG_FWD_REF_LUMA_ADDR, fwd_luma_addr); cedrus_write(dev, VE_DEC_MPEG_FWD_REF_CHROMA_ADDR, fwd_chroma_addr); - backward_idx = cedrus_reference_index_find(cap_q, &run->dst->vb2_buf, - slice_params->backward_ref_ts); - + backward_idx = vb2_find_timestamp(cap_q, + slice_params->backward_ref_ts, 0); bwd_luma_addr = cedrus_dst_buf_addr(ctx, backward_idx, 0); bwd_chroma_addr = cedrus_dst_buf_addr(ctx, backward_idx, 1); |