Commit 5946ef6f authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

staging: bcm2835-camera: Handle empty EOS buffers whilst streaming 



The change to mapping V4L2 to MMAL buffers 1:1 didn't handle
the condition we get with raw pixel buffers (eg YUV and RGB)
direct from the camera's stills port. That sends the pixel buffer
and then an empty buffer with the EOS flag set. The EOS buffer
wasn't handled and returned an error up the stack.

Handle the condition correctly by returning it to the component
if streaming, or returning with an error if stopping streaming.

Fixes: 93841670 "staging: bcm2835-camera: Remove V4L2/MMAL buffer remapping"

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 5acfee8b

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+12 −9
Original line number Diff line number Diff line
@@ -346,16 +346,13 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 


	if (length == 0) {

		/* stream ended */

		if (buf) {

			/* this should only ever happen if the port is

			 * disabled and there are buffers still queued

		if (dev->capture.frame_count) {

			/* empty buffer whilst capturing - expected to be an

			 * EOS, so grab another frame

			 */

			vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

			pr_debug("Empty buffer");

		} else if (dev->capture.frame_count) {

			/* grab another frame */

			if (is_capturing(dev)) {

				pr_debug("Grab another frame");

				v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

					 "Grab another frame");

				vchiq_mmal_port_parameter_set(

					instance,

					dev->capture.camera_port,
@@ -363,8 +360,14 @@ static void buffer_cb(struct vchiq_mmal_instance *instance, 
					&dev->capture.frame_count,

					sizeof(dev->capture.frame_count));

			}

			if (vchiq_mmal_submit_buffer(instance, port, buf))

				v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,

					 "Failed to return EOS buffer");

		} else {

			/* signal frame completion */

			/* stopping streaming.

			 * return buffer, and signal frame completion

			 */

			vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);

			complete(&dev->capture.frame_cmplt);

		}

		return;

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+3 −2
Original line number Diff line number Diff line
@@ -404,8 +404,6 @@ static int bulk_receive(struct vchiq_mmal_instance *instance, 


	/* store length */

	msg_context->u.bulk.buffer_used = rd_len;

	msg_context->u.bulk.mmal_flags =

	    msg->u.buffer_from_host.buffer_header.flags;

	msg_context->u.bulk.dts = msg->u.buffer_from_host.buffer_header.dts;

	msg_context->u.bulk.pts = msg->u.buffer_from_host.buffer_header.pts;
@@ -533,6 +531,9 @@ static void buffer_to_host_cb(struct vchiq_mmal_instance *instance, 
		return;

	}



	msg_context->u.bulk.mmal_flags =

				msg->u.buffer_from_host.buffer_header.flags;



	if (msg->h.status != MMAL_MSG_STATUS_SUCCESS) {

		/* message reception had an error */

		pr_warn("error %d in reply\n", msg->h.status);