diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2014-07-11 06:36:32 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2014-07-22 12:08:43 -0300 |
| commit | 410e5e493895ad9018f19dfbca92d65e1eadcbbe (patch) | |
| tree | ff0b91712cec5bae1438c6d641ab86323fd71c1a | |
| parent | 846ced9c0ebfcb4d42718fcbb487d6e0e52142ec (diff) | |
| download | linux-410e5e493895ad9018f19dfbca92d65e1eadcbbe.tar.bz2 | |
[media] coda: alert userspace about macroblock errors
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>
| -rw-r--r-- | drivers/media/platform/coda.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c index c7e557a5788f..d4e700391bba 100644 --- a/drivers/media/platform/coda.c +++ b/drivers/media/platform/coda.c @@ -243,6 +243,7 @@ struct coda_ctx { struct coda_aux_buf internal_frames[CODA_MAX_FRAMEBUFFERS]; u32 frame_types[CODA_MAX_FRAMEBUFFERS]; struct coda_timestamp frame_timestamps[CODA_MAX_FRAMEBUFFERS]; + u32 frame_errors[CODA_MAX_FRAMEBUFFERS]; struct list_head timestamp_list; struct coda_aux_buf workbuf; int num_internal_frames; @@ -3016,6 +3017,7 @@ static void coda_finish_decode(struct coda_ctx *ctx) int display_idx; u32 src_fourcc; int success; + u32 err_mb; u32 val; 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 */ } - val = coda_read(dev, CODA_RET_DEC_PIC_ERR_MB); - if (val > 0) + err_mb = coda_read(dev, CODA_RET_DEC_PIC_ERR_MB); + if (err_mb > 0) v4l2_err(&dev->v4l2_dev, - "errors in %d macroblocks\n", val); + "errors in %d macroblocks\n", err_mb); if (dev->devtype->product == CODA_7541) { 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; else ctx->frame_types[decoded_idx] = V4L2_BUF_FLAG_BFRAME; + + ctx->frame_errors[decoded_idx] = err_mb; } 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); - v4l2_m2m_buf_done(dst_buf, success ? VB2_BUF_STATE_DONE : - VB2_BUF_STATE_ERROR); + v4l2_m2m_buf_done(dst_buf, ctx->frame_errors[display_idx] ? + VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE); v4l2_dbg(1, coda_debug, &dev->v4l2_dev, "job finished: decoding frame (%d) (%s)\n", |