Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9832d765f82769799ba15ac9d2e8edf8f7de6898

Authored by Theodore Kilgore
Committed by Mauro Carvalho Chehab
1 parent 9f9cd8f18c
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (10986): mr97310a: don't discard frame headers on stream output 

Fix a bug where all frame headers were being discarded, instead of being part of the
stream output, on MR97310A cameras.

The frame headers contain information which may be useful in processing
the video output and therefore should be kept and not discarded.

A corresponding patch to the decompression algorithm in
libv4lconvert/mr97310a.c corrects the change in frame offset.

Signed-off-by: Theodore Kilgore <kilgota@auburn.edu>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 1 changed file with 3 additions and 19 deletions Side-by-side Diff

drivers/media/video/gspca/mr97310a.c
Diff comments   View file @ 9832d76
... ... @@ -29,9 +29,7 @@
29 29 /* specific webcam descriptor */
30 30 struct sd {
31 31 struct gspca_dev gspca_dev; /* !! must be the first item */
32   -
33 32 u8 sof_read;
34   - u8 header_read;
35 33 };
36 34  
37 35 /* V4L2 controls supported by the driver */
... ... @@ -285,7 +283,6 @@
285 283 __u8 *data, /* isoc packet */
286 284 int len) /* iso packet length */
287 285 {
288   - struct sd *sd = (struct sd *) gspca_dev;
289 286 unsigned char *sof;
290 287  
291 288 sof = pac_find_sof(gspca_dev, data, len);
292 289  
... ... @@ -300,25 +297,12 @@
300 297 n = 0;
301 298 frame = gspca_frame_add(gspca_dev, LAST_PACKET, frame,
302 299 data, n);
303   - sd->header_read = 0;
304   - gspca_frame_add(gspca_dev, FIRST_PACKET, frame, NULL, 0);
  300 + /* Start next frame. */
  301 + gspca_frame_add(gspca_dev, FIRST_PACKET, frame,
  302 + pac_sof_marker, sizeof pac_sof_marker);
305 303 len -= sof - data;
306 304 data = sof;
307 305 }
308   - if (sd->header_read < 7) {
309   - int needed;
310   -
311   - /* skip the rest of the header */
312   - needed = 7 - sd->header_read;
313   - if (len <= needed) {
314   - sd->header_read += len;
315   - return;
316   - }
317   - data += needed;
318   - len -= needed;
319   - sd->header_read = 7;
320   - }
321   -
322 306 gspca_frame_add(gspca_dev, INTER_PACKET, frame, data, len);
323 307 }
324 308