Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-12 09:36:45 +02:00
Code Issues Projects Releases Wiki Activity

Changed to toggle video command rather than two separate commands

Browse Source
This commit is contained in:
cnhenry
2015-08-12 08:24:43 -05:00
parent 2cdcbc07a7
commit 8a66c3fa4c
5 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/video_device.c
View File

@ -171,7 +171,7 @@ VideoDeviceError init_video_devices()
{
size[vdt_input] = 0;
#ifdef __linux__
#ifdef __linux__
for (; size[vdt_input] <= MAX_DEVICES; ++size[vdt_input]) {
int fd;
char device_address[] = "/dev/videoXX";
@ -186,6 +186,7 @@ VideoDeviceError init_video_devices()
/* Query V4L for capture capabilities */
if ( ioctl(fd, VIDIOC_QUERYCAP, &cap) != -1 ) {
//strcpy(video_input_name,cap.card);
video_input_name = cap.card;
} else {
video_input_name = device_address;
@ -195,11 +196,13 @@ VideoDeviceError init_video_devices()
close(fd);
}
}
#endif /* __linux__ */
#else /* __OSX__ */
/* TODO: Add OSX implementation for listing input video devices */
#endif
size[vdt_output] = 1;
char* video_output_name = "Video Receiver";
char* video_output_name = "Toxic Video Receiver";
video_devices_names[vdt_output][0] = video_output_name;
// Start poll thread
@ -598,6 +601,7 @@ void* video_thread_poll (void* arg) // TODO: maybe use thread for every input so
u = device->input.planes[1];
v = device->input.planes[2];
#else /* __OSX__*/
#endif
/* Convert frame image data to YUV420 for ToxAV */