UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: Revert "media: cedrus: Allow using the current dst buffer as reference" 

This reverts commit cf20ae1535.

The vb2_find_timestamp helper was modified to allow finding buffers
regardless of their current state in the queue. This means that we
no longer have to take particular care of references to the current
capture buffer.

Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Paul Kocialkowski 2019-01-24 10:49:45 -02:00 committed by Mauro Carvalho Chehab
parent 03535e7a3a
commit 826ef75088
3 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/media/sunxi/cedrus/cedrus_dec.c
View File

@ -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;

2
drivers/staging/media/sunxi/cedrus/cedrus_dec.h
View File

@ -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

10
drivers/staging/media/sunxi/cedrus/cedrus_mpeg2.c
View File

@ -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);