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

Refactoring to compliment OSX

Browse Source
This commit is contained in:
cnhenry
2015-08-16 02:20:16 -05:00
parent 619fdc1098
commit e91aaf6c73
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/video_device.c
View File

@ -65,9 +65,12 @@ typedef struct VideoDevice {
void* cb_data; /* Data to be passed to callback */
int32_t friend_number; /* ToxAV friend number */
#ifdef __linux__
struct v4l2_format fmt;
struct VideoBuffer *buffers;
uint32_t n_buffers;
uint32_t n_buffers;
#else /* __OSX__ */
#endif
uint32_t ref_count;
int32_t selection;
@ -660,10 +663,13 @@ void* video_thread_poll (void* arg) // TODO: maybe use thread for every input so
XFlush(device->x_display);
free(img_data);
#ifdef __linux__
if ( -1 == xioctl(device->fd, VIDIOC_QBUF, &buf) ) {
unlock;
continue;
}
#else /* __OSX__ */
#endif
}
unlock;
}
@ -692,7 +698,7 @@ VideoDeviceError close_video_device(VideoDeviceType type, uint32_t device_idx)
if ( !device->ref_count ) {
if ( type == vdt_input ) {
#ifdef __linux__
enum v4l2_buf_type buf_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
if( -1 == xioctl(device->fd, VIDIOC_STREAMOFF, &buf_type) ) {}
@ -701,12 +707,18 @@ VideoDeviceError close_video_device(VideoDeviceType type, uint32_t device_idx)
if ( -1 == munmap(device->buffers[i].start, device->buffers[i].length) ) {
}
}
#else /* __OSX__ */
#endif
close(device->fd);
XDestroyWindow(device->x_display, device->x_window);
XFlush(device->x_display);
XCloseDisplay(device->x_display);
pthread_mutex_destroy(device->mutex);
#ifdef __linux__
free(device->buffers);
#else /* __OSX__ */
#endif
free(device);
} else {
vpx_img_free(&device->input);