summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46ff483)
raw | patch | inline | side by side (parent: 46ff483)
author | Josh Elliott <jelliott@ti.com> | |
Tue, 29 Apr 2014 18:49:09 +0000 (13:49 -0500) | ||
committer | Josh Elliott <jelliott@ti.com> | |
Tue, 29 Apr 2014 18:49:09 +0000 (13:49 -0500) |
loopback.cpp | patch | blob | history |
diff --git a/loopback.cpp b/loopback.cpp
index 4a8f746b603db029f0b0344f3bedb86b9068170f..2b99d661ca749e02288f25ba0e4309213228c44b 100644 (file)
--- a/loopback.cpp
+++ b/loopback.cpp
}
printf("temp_buffers[%d].start - %x\n", i,
(unsigned int)temp_buffers[i].start);
-
- ret = ioctl(device->fd, VIDIOC_QBUF, &buf);
- if (ret < 0) {
- perror("VIDIOC_QBUF");
- device->num_buffers = i;
- goto ERROR1;
- }
}
device->buffers = temp_buffers;
*/
static int v4l2_stream_on(struct v4l2_device_info *device)
{
- int a, ret;
+ int a, i, ret;
+
+ for (i = 0; i < device->num_buffers; ++i) {
+ struct v4l2_buffer buf;
+
+ buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ buf.memory = V4L2_MEMORY_MMAP;
+ buf.index = i;
+
+ ret = ioctl(device->fd, VIDIOC_QBUF, &buf);
+ if (ret < 0) {
+ perror("VIDIOC_QBUF");
+ device->num_buffers = i;
+ return -1;
+ }
+ }
+
+ device->buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+ device->buf.index = 0;
+ device->buf.memory = device->memory_mode;
a = V4L2_BUF_TYPE_VIDEO_CAPTURE;
ret = ioctl(device->fd, VIDIOC_STREAMON, &a);
}
printf("%s: Stream on\n", device->name);
- device->buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
- device->buf.index = 0;
- device->buf.memory = device->memory_mode;
-
return 0;
}
fprintf(f,"%d", 1);
fclose(f);
- /* Set scalar for PiP video plane to 1/4 of main video plane */
+ /* Set scalar for PiP video plane to 1/3 of main video plane */
fb2_device.pi.enabled = 0;
fb2_device.pi.out_width = fb1_device.pi.out_width/3;
fb2_device.pi.out_height = fb1_device.pi.out_height/3;