media: allegro: skip filler data if possible

The driver instructs the firmware to leave some space space in front of
the coded frame data for SPS/PPS data. If the driver receives an IDR, it
writes the SPS/PPS into that free space and fills the rest with filler
data. However, if there is no additional data, the driver can use the
plane offset to skip this space instead of adding filler data.

As the size of the SPS/PPS is only available after writing it, keep the
filler data between the SPS/PPS and the coded frame data.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index 8321b1e..b657230 100644 (file)
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -1652,17 +1652,22 @@ static void allegro_channel_finish_frame(struct allegro_channel *channel,
                         channel->mcu_channel_id, len);
        }
 
-       len = nal_h264_write_filler(&dev->plat_dev->dev, curr, free);
-       if (len < 0) {
-               v4l2_err(&dev->v4l2_dev,
-                        "failed to write %zd filler data\n", free);
-               goto err;
+       if (msg->slice_type != AL_ENC_SLICE_TYPE_I && !msg->is_idr) {
+               dst_buf->vb2_buf.planes[0].data_offset = free;
+               free = 0;
+       } else {
+               len = nal_h264_write_filler(&dev->plat_dev->dev, curr, free);
+               if (len < 0) {
+                       v4l2_err(&dev->v4l2_dev,
+                                "failed to write %zd filler data\n", free);
+                       goto err;
+               }
+               curr += len;
+               free -= len;
+               v4l2_dbg(2, debug, &dev->v4l2_dev,
+                        "channel %d: wrote %zd bytes filler nal unit\n",
+                        channel->mcu_channel_id, len);
        }
-       curr += len;
-       free -= len;
-       v4l2_dbg(2, debug, &dev->v4l2_dev,
-                "channel %d: wrote %zd bytes filler nal unit\n",
-                channel->mcu_channel_id, len);
 
        if (free != 0) {
                v4l2_err(&dev->v4l2_dev,