From: "Frank Schäfer" <fschaefer.oss@googlemail.com>
To: mchehab@redhat.com
Cc: linux-media@vger.kernel.org,
"Frank Schäfer" <fschaefer.oss@googlemail.com>
Subject: [PATCH 3/6] em28xx: fix capture type setting in em28xx_urb_data_copy_vbi()
Date: Sun, 25 Nov 2012 11:37:34 +0100 [thread overview]
Message-ID: <1353839857-2990-4-git-send-email-fschaefer.oss@googlemail.com> (raw)
In-Reply-To: <1353839857-2990-1-git-send-email-fschaefer.oss@googlemail.com>
Set capture type to 1 (video start) when the video frame start header is
detected. This bug didn't cause any trouble, because this type of header is
never received in vbi mode.
Fix it, because we want to use this function with disabled vbi in the future.
Also start with capture type -1 to avoid processing of corrupted/incomplete
frame data which is usually received at streaming start (especially when
USB bulk transfers are used).
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
---
drivers/media/usb/em28xx/em28xx-video.c | 2 ++
1 Datei geändert, 2 Zeilen hinzugefügt(+)
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 0bbc6dc..b170476 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -603,6 +603,7 @@ static inline int em28xx_urb_data_copy_vbi(struct em28xx *dev, struct urb *urb)
len -= 4;
} else if (p[0] == 0x22 && p[1] == 0x5a) {
/* start video */
+ dev->capture_type = 1;
p += 4;
len -= 4;
}
@@ -774,6 +775,7 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
urb_init = 1;
if (urb_init) {
+ dev->capture_type = -1;
if (em28xx_vbi_supported(dev) == 1)
rc = em28xx_init_usb_xfer(dev, EM28XX_ANALOG_MODE,
dev->analog_xfer_bulk,
--
1.7.10.4
next prev parent reply other threads:[~2012-11-25 10:37 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-25 10:37 [PATCH 0/6] em28xx: use common urb data copying function for vbi and non-vbi data streams Frank Schäfer
2012-11-25 10:37 ` [PATCH 1/6] em28xx: fix video data start position calculation in em28xx_urb_data_copy_vbi() Frank Schäfer
2012-11-25 10:37 ` [PATCH 2/6] em28xx: make sure the packet size is >= 4 before checking for headers " Frank Schäfer
2012-11-25 10:37 ` Frank Schäfer [this message]
2012-11-25 10:37 ` [PATCH 4/6] em28xx: fix/improve frame field handling " Frank Schäfer
2012-11-25 10:37 ` [PATCH 5/6] em28xx: em28xx_urb_data_copy_vbi(): calculate vbi_size only if needed Frank Schäfer
2012-11-25 10:37 ` [PATCH 6/6] em28xx: use common urb data copying function for vbi and non-vbi data streams Frank Schäfer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353839857-2990-4-git-send-email-fschaefer.oss@googlemail.com \
--to=fschaefer.oss@googlemail.com \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox