diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2019-06-18 12:45:22 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-26 09:14:10 +0200 |
| commit | d562537dbf0d884fab82654ed3df0130736b0903 (patch) | |
| tree | 4af92fc5194e42fd8e5b6abfd231eb0f2e344715 /drivers | |
| parent | 3697c12c44259e1b3e16ce4cf1be9348e624893a (diff) | |
| download | linux-stable-d562537dbf0d884fab82654ed3df0130736b0903.tar.gz linux-stable-d562537dbf0d884fab82654ed3df0130736b0903.tar.bz2 linux-stable-d562537dbf0d884fab82654ed3df0130736b0903.zip | |
media: coda: increment sequence offset for the last returned frame
[ Upstream commit b3b7d96817cdb8b6fc353867705275dce8f41ccc ]
If no more frames are decoded in bitstream end mode, and a previously
decoded frame has been returned, the firmware still increments the frame
number. To avoid a sequence number mismatch after decoder restart,
increment the sequence_offset correction parameter.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/platform/coda/coda-bit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 25ef0c928a81..925581d65ad8 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c @@ -2143,6 +2143,9 @@ static void coda_finish_decode(struct coda_ctx *ctx) else if (ctx->display_idx < 0) ctx->hold = true; } else if (decoded_idx == -2) { + if (ctx->display_idx >= 0 && + ctx->display_idx < ctx->num_internal_frames) + ctx->sequence_offset++; /* no frame was decoded, we still return remaining buffers */ } else if (decoded_idx < 0 || decoded_idx >= ctx->num_internal_frames) { v4l2_err(&dev->v4l2_dev, |