stk1160: fix sequence handling

PATCH New Hans Verkuil 1 participant 1 message Jun 8, 2015

Subsystems (2)

Media (V4L/DVB) STK1160 USB video capture driver

lore

Share & tools

lore

Hans Verkuil

author

2015-06-08 09:54 UTC #0 lore raw

PATCH 1/1 stk1160: fix sequence handling

Fix the sequence counter: we're counting frames, not fields.

Also remove the unused 'field' field. That would only be needed if this driver would support V4L2_FIELD_ALTERNATE.

Signed-off-by Hans Verkuil <[email protected]>

drivers/media/usb/stk1160/stk1160-v4l.c +2 -0

index 4d313ed..7291cca 100644
@@ -194,6 +194,8 @@ static int stk1160_start_streaming(struct stk1160 *dev)
 	/* Start saa711x */
 	v4l2_device_call_all(&dev->v4l2_dev, 0, video, s_stream, 1);
 
+	dev->sequence = 0;
+
 	/* Start stk1160 */
 	stk1160_write_reg(dev, STK1160_DCTRL, 0xb3);
 	stk1160_write_reg(dev, STK1160_DCTRL+3, 0x00);

drivers/media/usb/stk1160/stk1160-video.c +1 -3

index 39f1aae..940c3ea 100644
@@ -96,9 +96,7 @@ void stk1160_buffer_done(struct stk1160 *dev)
 {
 	struct stk1160_buffer *buf = dev->isoc_ctl.buf;
 
-	dev->field_count++;
-
-	buf->vb.v4l2_buf.sequence = dev->field_count >> 1;
+	buf->vb.v4l2_buf.sequence = dev->sequence++;
 	buf->vb.v4l2_buf.field = V4L2_FIELD_INTERLACED;
 	buf->vb.v4l2_buf.bytesused = buf->bytesused;
 	v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);

drivers/media/usb/stk1160/stk1160.h +1 -2

index abdea48..3922a6c 100644
@@ -151,8 +151,7 @@ struct stk1160 {
 	v4l2_std_id norm;	  /* current norm */
 	struct stk1160_fmt *fmt;  /* selected format */
 
-	unsigned int field_count; /* not sure ??? */
-	enum v4l2_field field;    /* also not sure :/ */
+	unsigned int sequence;
 
 	/* i2c i/o */
 	struct i2c_adapter i2c_adap;