---

yaml --- r: 366842 b: refs/heads/master c: 15513c1 h: refs/heads/master v: v3
git-mirror · Mar 25, 2013 · 7ee5916 · 7ee5916
1 parent 93e5071
commit 7ee5916
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a8bfe9fe958beef9cfb9a6f7b0922cc51deb65c
+refs/heads/master: 15513c12e3c5f5e7c683865b3e019cf90babab8f
diff --git a/trunk/drivers/staging/media/solo6x10/solo6x10.h b/trunk/drivers/staging/media/solo6x10/solo6x10.h
@@ -173,6 +173,7 @@ struct solo_enc_dev {
 
 	u32			fmt;
 	enum solo_enc_types	type;
+	u32			sequence;
 	struct vb2_queue	vidq;
 	struct list_head	vidq_active;
 	int			desc_count;
@@ -267,6 +268,7 @@ struct solo_dev {
 	/* Buffer handling */
 	struct vb2_queue	vidq;
 	struct vb2_alloc_ctx	*alloc_ctx;
+	u32			sequence;
 	struct task_struct      *kthread;
 	struct mutex		lock;
 	spinlock_t		slock;

diff --git a/trunk/drivers/staging/media/solo6x10/v4l2-enc.c b/trunk/drivers/staging/media/solo6x10/v4l2-enc.c
@@ -269,6 +269,7 @@ static int solo_enc_on(struct solo_enc_dev *solo_enc)
 	/* Make sure to do a bandwidth check */
 	if (solo_enc->bw_weight > solo_dev->enc_bw_remain)
 		return -EBUSY;
+	solo_enc->sequence = 0;
 	solo_dev->enc_bw_remain -= solo_enc->bw_weight;
 
 	if (solo_enc->type == SOLO_ENC_TYPE_EXT)
@@ -522,7 +523,7 @@ static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
 		ret = solo_fill_jpeg(solo_enc, vb, vh);
 
 	if (!ret) {
-		vb->v4l2_buf.sequence++;
+		vb->v4l2_buf.sequence = solo_enc->sequence++;
 		vb->v4l2_buf.timestamp.tv_sec = vh->sec;
 		vb->v4l2_buf.timestamp.tv_usec = vh->usec;
 	}

diff --git a/trunk/drivers/staging/media/solo6x10/v4l2.c b/trunk/drivers/staging/media/solo6x10/v4l2.c
@@ -224,7 +224,7 @@ static void solo_fillbuf(struct solo_dev *solo_dev,
 	if (!error) {
 		vb2_set_plane_payload(vb, 0,
 			solo_vlines(solo_dev) * solo_bytesperline(solo_dev));
-		vb->v4l2_buf.sequence++;
+		vb->v4l2_buf.sequence = solo_dev->sequence++;
 		v4l2_get_timestamp(&vb->v4l2_buf.timestamp);
 	}
 
@@ -332,6 +332,7 @@ static int solo_start_streaming(struct vb2_queue *q, unsigned int count)
 {
 	struct solo_dev *solo_dev = vb2_get_drv_priv(q);
 
+	solo_dev->sequence = 0;
 	return solo_start_thread(solo_dev);
 }