BCM2835-V4L2: Correctly denote key frames in encoded data

Forward MMAL key frame flags to the V4L2 buffers.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.org>
(cherry picked from commit bca036359b15783f08931edfb86ce360b4f6b55e
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
index e383cb0f54627e1b9e0aff6928858ece4029ad25..23b785e22098ec1aaf491c799701f9f98620eff8 100644 (file)
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
@@ -398,6 +398,9 @@ static void buffer_cb(struct vchiq_mmal_instance *instance,
                        dev->capture.last_timestamp = buf->vb.vb2_buf.timestamp;
 
                        vb2_set_plane_payload(&buf->vb.vb2_buf, 0, length);
+                       if (mmal_flags & MMAL_BUFFER_HEADER_FLAG_KEYFRAME)
+                               buf->vb.flags |= V4L2_BUF_FLAG_KEYFRAME;
+
                        v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
                                "Buffer has ts %llu",
                                dev->capture.last_timestamp);