renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 15:13:55 +08:00
Code

[media] coda: alert userspace about macroblock errors

Browse Source 
If the CODA reports macroblock errors, also set the VB2_BUF_STATE_ERROR flag
to alert userspace.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Philipp Zabel 2014-07-11 06:36:32 -03:00 committed by Mauro Carvalho Chehab
parent 846ced9c0e
commit 410e5e4938
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/platform/coda.c
View File

@ -243,6 +243,7 @@ struct coda_ctx {
struct coda_aux_buf internal_frames[CODA_MAX_FRAMEBUFFERS]; struct coda_aux_buf internal_frames[CODA_MAX_FRAMEBUFFERS];
u32 frame_types[CODA_MAX_FRAMEBUFFERS]; u32 frame_types[CODA_MAX_FRAMEBUFFERS];
struct coda_timestamp frame_timestamps[CODA_MAX_FRAMEBUFFERS]; struct coda_timestamp frame_timestamps[CODA_MAX_FRAMEBUFFERS];
u32 frame_errors[CODA_MAX_FRAMEBUFFERS];
struct list_head timestamp_list; struct list_head timestamp_list;
struct coda_aux_buf workbuf; struct coda_aux_buf workbuf;
int num_internal_frames; int num_internal_frames;
@ -3016,6 +3017,7 @@ static void coda_finish_decode(struct coda_ctx *ctx)
int display_idx; int display_idx;
u32 src_fourcc; u32 src_fourcc;
int success; int success;
u32 err_mb;
u32 val; u32 val;
dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx); dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
@ -3085,10 +3087,10 @@ static void coda_finish_decode(struct coda_ctx *ctx)
/* no cropping */ /* no cropping */
} }
val = coda_read(dev, CODA_RET_DEC_PIC_ERR_MB); err_mb = coda_read(dev, CODA_RET_DEC_PIC_ERR_MB);
if (val > 0) if (err_mb > 0)
v4l2_err(&dev->v4l2_dev, v4l2_err(&dev->v4l2_dev,
"errors in %d macroblocks\n", val); "errors in %d macroblocks\n", err_mb);
if (dev->devtype->product == CODA_7541) { if (dev->devtype->product == CODA_7541) {
val = coda_read(dev, CODA_RET_DEC_PIC_OPTION); val = coda_read(dev, CODA_RET_DEC_PIC_OPTION);
@ -3151,6 +3153,8 @@ static void coda_finish_decode(struct coda_ctx *ctx)
ctx->frame_types[decoded_idx] = V4L2_BUF_FLAG_PFRAME; ctx->frame_types[decoded_idx] = V4L2_BUF_FLAG_PFRAME;
else else
ctx->frame_types[decoded_idx] = V4L2_BUF_FLAG_BFRAME; ctx->frame_types[decoded_idx] = V4L2_BUF_FLAG_BFRAME;
ctx->frame_errors[decoded_idx] = err_mb;
} }
if (display_idx == -1) { if (display_idx == -1) {
@ -3183,8 +3187,8 @@ static void coda_finish_decode(struct coda_ctx *ctx)
vb2_set_plane_payload(dst_buf, 0, width * height * 3 / 2); vb2_set_plane_payload(dst_buf, 0, width * height * 3 / 2);
v4l2_m2m_buf_done(dst_buf, success ? VB2_BUF_STATE_DONE : v4l2_m2m_buf_done(dst_buf, ctx->frame_errors[display_idx] ?
VB2_BUF_STATE_ERROR); VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
v4l2_dbg(1, coda_debug, &dev->v4l2_dev, v4l2_dbg(1, coda_debug, &dev->v4l2_dev,
"job finished: decoding frame (%d) (%s)\n", "job finished: decoding frame (%d) (%s)\n",