--- tvi_v4l.c.orig Mon Jun 24 18:37:18 2002 +++ tvi_v4l.c Sun Aug 4 12:37:53 2002 @@ -26,6 +26,7 @@ #include #include #include +#include #include "mp_msg.h" #include "../libao2/afmt.h" @@ -43,6 +44,9 @@ #define MAX_AUDIO_CHANNELS 10 +#define AUD_BUF_SIZE 256 +#define VID_BUF_SIZE 64 + typedef struct { /* general */ char *video_device; @@ -64,7 +68,6 @@ unsigned char *mmap; struct video_mmap *buf; int nbuf; - int queue; /* audio */ int audio_id; @@ -77,8 +80,35 @@ int audio_samplerate[MAX_AUDIO_CHANNELS]; int audio_blocksize; - /* other */ + /* buffering stuff */ + int audio_buffer_size; + unsigned char *audio_ringbuffer; + volatile int audio_empty; + volatile int audio_head; + volatile int audio_tail; + volatile int audio_cnt; + volatile double audio_skew; + volatile int audio_drop; + + int video_buffer_size; + unsigned char *video_ringbuffer; + double *video_timebuffer; + volatile int video_head; + volatile int video_tail; + volatile int video_cnt; + + volatile int shutdown; + + pthread_t audio_grabber_thread; + pthread_t video_grabber_thread; + double starttime; + double audio_secs_per_byte; + double audio_skew_total; + long audio_recv_blocks_total; + long long audio_sent_bytes_total; + long long audio_recv_bytes_total; + } priv_t; #include "tvi_def.h" @@ -100,6 +130,9 @@ "unknown", "mono", "stereo", "language1", "language2", NULL }; +void *audio_grabber(void *data); +void *video_grabber(void *data); + static int palette2depth(int palette) { switch(palette) @@ -184,67 +217,10 @@ return(h); } -static int init(priv_t *priv) +static void init_audio(priv_t *priv) { int i; - priv->video_fd = open(priv->video_device, O_RDWR); - mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %x\n", priv->video_fd, - priv->video_device); - if (priv->video_fd == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "unable to open '%s': %s\n", - priv->video_device, strerror(errno)); - goto err; - } - - priv->fps = 25; /* pal */ - - /* get capabilities (priv->capability is needed!) */ - if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); - goto err; - } - - fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC); - - mp_msg(MSGT_TV, MSGL_INFO, "Selected device: %s\n", priv->capability.name); - mp_msg(MSGT_TV, MSGL_INFO, " Capabilites: "); - for (i = 0; device_cap2name[i] != NULL; i++) - if (priv->capability.type & (1 << i)) - mp_msg(MSGT_TV, MSGL_INFO, "%s ", device_cap2name[i]); - mp_msg(MSGT_TV, MSGL_INFO, "\n"); - mp_msg(MSGT_TV, MSGL_INFO, " Device type: %d\n", priv->capability.type); - mp_msg(MSGT_TV, MSGL_INFO, " Supported sizes: %dx%d => %dx%d\n", - priv->capability.minwidth, priv->capability.minheight, - priv->capability.maxwidth, priv->capability.maxheight); - priv->width = priv->capability.minwidth; - priv->height = priv->capability.minheight; - mp_msg(MSGT_TV, MSGL_INFO, " Inputs: %d\n", priv->capability.channels); - - priv->channels = (struct video_channel *)malloc(sizeof(struct video_channel)*priv->capability.channels); - if (!priv->channels) - goto malloc_failed; - memset(priv->channels, 0, sizeof(struct video_channel)*priv->capability.channels); - for (i = 0; i < priv->capability.channels; i++) - { - priv->channels[i].channel = i; - if (ioctl(priv->video_fd, VIDIOCGCHAN, &priv->channels[i]) == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get channel failed: %s\n", strerror(errno)); - break; - } - mp_msg(MSGT_TV, MSGL_INFO, " %d: %s: %s%s%s%s (tuner:%d, norm:%d)\n", i, - priv->channels[i].name, - (priv->channels[i].flags & VIDEO_VC_TUNER) ? "tuner " : "", - (priv->channels[i].flags & VIDEO_VC_AUDIO) ? "audio " : "", - (priv->channels[i].flags & VIDEO_TYPE_TV) ? "tv " : "", - (priv->channels[i].flags & VIDEO_TYPE_CAMERA) ? "camera " : "", - priv->channels[i].tuners, - priv->channels[i].norm); - } - /* audio chanlist */ if (priv->capability.audios) { @@ -304,41 +280,7 @@ audio_out_format_name(priv->audio_format[i])); } } - - if (!(priv->capability.type & VID_TYPE_CAPTURE)) - { - mp_msg(MSGT_TV, MSGL_ERR, "Only grabbing supported (for overlay use another program)\n"); - goto err; - } - /* map grab buffer */ - if (ioctl(priv->video_fd, VIDIOCGMBUF, &priv->mbuf) == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get mbuf failed: %s\n", strerror(errno)); - goto err; - } - - mp_msg(MSGT_TV, MSGL_V, "mbuf: size=%d, frames=%d\n", - priv->mbuf.size, priv->mbuf.frames); - priv->mmap = mmap(0, priv->mbuf.size, PROT_READ|PROT_WRITE, - MAP_SHARED, priv->video_fd, 0); - if (priv->mmap == (unsigned char *)-1) - { - mp_msg(MSGT_TV, MSGL_ERR, "Unable to map memory for buffers: %s\n", strerror(errno)); - goto err; - } - mp_msg(MSGT_TV, MSGL_DBG2, "our buffer: %p\n", priv->mmap); - - /* num of buffers */ - priv->nbuf = priv->mbuf.frames; - - /* video buffers */ - priv->buf = (struct video_mmap *)malloc(priv->nbuf * sizeof(struct video_mmap)); - if (!priv->buf) - goto malloc_failed; - memset(priv->buf, 0, priv->nbuf * sizeof(struct video_mmap)); - - /* audio init */ #if 1 priv->audio_fd = open(priv->audio_device, O_RDONLY); if (priv->audio_fd < 0) @@ -362,6 +304,7 @@ printf("ioctl dsp getfmt: %d\n", ioctl(priv->audio_fd, SNDCTL_DSP_GETFMTS, &ioctl_param)); + printf("Audio ID: %x\n", priv->audio_id); printf("Supported formats: %x\n", ioctl_param); if (!(ioctl_param & priv->audio_format[priv->audio_id])) printf("notsupported format\n"); @@ -418,8 +361,108 @@ printf("blocksize: %d\n", priv->audio_blocksize); } #endif - return(1); +} +static int init(priv_t *priv) +{ + int i; + + priv->video_fd = open(priv->video_device, O_RDWR); + mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %x\n", priv->video_fd, + priv->video_device); + if (priv->video_fd == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "unable to open '%s': %s\n", + priv->video_device, strerror(errno)); + goto err; + } + + priv->fps = 25; /* pal */ + + /* get capabilities (priv->capability is needed!) */ + if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + goto err; + } + + fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC); + + mp_msg(MSGT_TV, MSGL_INFO, "Selected device: %s\n", priv->capability.name); + mp_msg(MSGT_TV, MSGL_INFO, " Capabilites: "); + for (i = 0; device_cap2name[i] != NULL; i++) + if (priv->capability.type & (1 << i)) + mp_msg(MSGT_TV, MSGL_INFO, "%s ", device_cap2name[i]); + mp_msg(MSGT_TV, MSGL_INFO, "\n"); + mp_msg(MSGT_TV, MSGL_INFO, " Device type: %d\n", priv->capability.type); + mp_msg(MSGT_TV, MSGL_INFO, " Supported sizes: %dx%d => %dx%d\n", + priv->capability.minwidth, priv->capability.minheight, + priv->capability.maxwidth, priv->capability.maxheight); + priv->width = priv->capability.minwidth; + priv->height = priv->capability.minheight; + mp_msg(MSGT_TV, MSGL_INFO, " Inputs: %d\n", priv->capability.channels); + + priv->channels = (struct video_channel *)malloc(sizeof(struct video_channel)*priv->capability.channels); + if (!priv->channels) + goto malloc_failed; + memset(priv->channels, 0, sizeof(struct video_channel)*priv->capability.channels); + for (i = 0; i < priv->capability.channels; i++) + { + priv->channels[i].channel = i; + if (ioctl(priv->video_fd, VIDIOCGCHAN, &priv->channels[i]) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get channel failed: %s\n", strerror(errno)); + break; + } + mp_msg(MSGT_TV, MSGL_INFO, " %d: %s: %s%s%s%s (tuner:%d, norm:%d)\n", i, + priv->channels[i].name, + (priv->channels[i].flags & VIDEO_VC_TUNER) ? "tuner " : "", + (priv->channels[i].flags & VIDEO_VC_AUDIO) ? "audio " : "", + (priv->channels[i].flags & VIDEO_TYPE_TV) ? "tv " : "", + (priv->channels[i].flags & VIDEO_TYPE_CAMERA) ? "camera " : "", + priv->channels[i].tuners, + priv->channels[i].norm); + } + + if (!(priv->capability.type & VID_TYPE_CAPTURE)) + { + mp_msg(MSGT_TV, MSGL_ERR, "Only grabbing supported (for overlay use another program)\n"); + goto err; + } + + /* map grab buffer */ + if (ioctl(priv->video_fd, VIDIOCGMBUF, &priv->mbuf) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get mbuf failed: %s\n", strerror(errno)); + goto err; + } + + mp_msg(MSGT_TV, MSGL_V, "mbuf: size=%d, frames=%d\n", + priv->mbuf.size, priv->mbuf.frames); + priv->mmap = mmap(0, priv->mbuf.size, PROT_READ|PROT_WRITE, + MAP_SHARED, priv->video_fd, 0); + if (priv->mmap == (unsigned char *)-1) + { + mp_msg(MSGT_TV, MSGL_ERR, "Unable to map memory for buffers: %s\n", strerror(errno)); + goto err; + } + mp_msg(MSGT_TV, MSGL_DBG2, "our buffer: %p\n", priv->mmap); + + /* num of buffers */ + priv->nbuf = priv->mbuf.frames; + + /* video buffers */ + priv->buf = (struct video_mmap *)malloc(priv->nbuf * sizeof(struct video_mmap)); + if (!priv->buf) + goto malloc_failed; + memset(priv->buf, 0, priv->nbuf * sizeof(struct video_mmap)); + + /* audio init */ + if (!tv_param_noaudio) { + init_audio(priv); + } + + return(1); malloc_failed: if (priv->channels) @@ -434,6 +477,15 @@ static int uninit(priv_t *priv) { + priv->shutdown = 1; + + mp_msg(MSGT_TV, MSGL_INFO, "Waiting for threads to finish... "); + if (!tv_param_noaudio) { + pthread_join(priv->audio_grabber_thread, NULL); + } + pthread_join(priv->video_grabber_thread, NULL); + mp_msg(MSGT_TV, MSGL_INFO, "done\n"); + close(priv->video_fd); priv->audio[priv->audio_id].volume = 0; @@ -447,7 +499,6 @@ static int start(priv_t *priv) { int i; - if (ioctl(priv->video_fd, VIDIOCGPICT, &priv->picture) == -1) { @@ -530,8 +581,57 @@ { struct timeval curtime; + int bytes_per_sample; + + if (!tv_param_noaudio) { + priv->audio_buffer_size = AUD_BUF_SIZE; + priv->audio_ringbuffer = (unsigned char*)malloc(priv->audio_blocksize*priv->audio_buffer_size); + if (!priv->audio_ringbuffer) { + mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate audio buffer: %s\n", strerror(errno)); + return 0; + } + + bytes_per_sample = 2; // FIXME + priv->audio_secs_per_byte = 1.0/(priv->audio_samplerate[priv->audio_id] + *priv->audio_channels[priv->audio_id] + *bytes_per_sample); + + priv->audio_empty = 1; + priv->audio_head = 0; + priv->audio_tail = 0; + priv->audio_cnt = 0; + priv->audio_drop = 0; + priv->audio_skew = 0.0; + priv->audio_skew_total = 0.0; + priv->audio_recv_blocks_total = 0; + + priv->audio_sent_bytes_total = 0; + priv->audio_recv_bytes_total = 0; + } + + priv->video_buffer_size = VID_BUF_SIZE * priv->nbuf; + priv->video_ringbuffer = (unsigned char*)malloc(priv->bytesperline * priv->height * priv->video_buffer_size); + if (!priv->video_ringbuffer) { + mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate video buffer: %s\n", strerror(errno)); + return 0; + } + priv->video_timebuffer = (double*)malloc(sizeof(double) * priv->video_buffer_size); + if (!priv->video_timebuffer) { + mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate time buffer: %s\n", strerror(errno)); + return 0; + } + priv->video_head = 0; + priv->video_tail = 0; + priv->video_cnt = 0; + gettimeofday(&curtime, NULL); priv->starttime=curtime.tv_sec + curtime.tv_usec*.000001; + + priv->shutdown = 0; + if (!tv_param_noaudio) { + pthread_create(&priv->audio_grabber_thread, NULL, audio_grabber, priv); + } + pthread_create(&priv->video_grabber_thread, NULL, video_grabber, priv); } return(1); @@ -827,44 +927,82 @@ return(TVI_CONTROL_UNKNOWN); } -static double grab_video_frame(priv_t *priv, char *buffer, int len) +void *video_grabber(void *data) { + priv_t *priv = (priv_t*)data; struct timeval curtime; double timestamp; - int frame = priv->queue % priv->nbuf; - int nextframe = (priv->queue+1) % priv->nbuf; + int frame, nextframe; + int fsize = priv->bytesperline * priv->height; + int i; - mp_dbg(MSGT_TV, MSGL_DBG2, "grab_video_frame(priv=%p, buffer=%p, len=%d)\n", - priv, buffer, len); + fprintf(stderr, "video_grabber\n"); - mp_dbg(MSGT_TV, MSGL_DBG3, "buf: %p + frame: %d => %p\n", - priv->buf, nextframe, &priv->buf[nextframe]); - if (ioctl(priv->video_fd, VIDIOCMCAPTURE, &priv->buf[nextframe]) == -1) + if (!tv_param_noaudio) { + while (priv->audio_empty) { + usleep(10000); + } + } + + // initialize video capture + if (ioctl(priv->video_fd, VIDIOCMCAPTURE, &priv->buf[0]) == -1) { mp_msg(MSGT_TV, MSGL_ERR, "ioctl mcapture failed: %s\n", strerror(errno)); - return(0); } - while (ioctl(priv->video_fd, VIDIOCSYNC, &priv->buf[frame].frame) < 0 && - (errno == EAGAIN || errno == EINTR)); - mp_dbg(MSGT_TV, MSGL_DBG3, "picture sync failed\n"); + for (;!priv->shutdown;) + { + for (i = 0; i < priv->nbuf; i++) { + frame = i; + nextframe = (i+1)%priv->nbuf; + + if (ioctl(priv->video_fd, VIDIOCMCAPTURE, &priv->buf[nextframe]) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl mcapture failed: %s\n", strerror(errno)); + continue; + } + + while (ioctl(priv->video_fd, VIDIOCSYNC, &priv->buf[frame].frame) < 0 && + (errno == EAGAIN || errno == EINTR)); + mp_dbg(MSGT_TV, MSGL_DBG3, "picture sync failed\n"); + + gettimeofday(&curtime, NULL); + priv->video_timebuffer[priv->video_tail+i] = curtime.tv_sec + curtime.tv_usec*.000001 - priv->starttime; + + fast_memcpy(priv->video_ringbuffer+(priv->video_tail+i)*fsize, priv->mmap+priv->mbuf.offsets[frame], fsize); + } + + if ((priv->video_tail+priv->nbuf) % priv->video_buffer_size == (priv->video_head/priv->nbuf)*priv->nbuf) { + mp_msg(MSGT_TV, MSGL_ERR, "video buffer full - dropping frame\n"); + } else { +// mp_msg(MSGT_TV, MSGL_ERR, "frame inserted\n"); + priv->video_tail = (priv->video_tail+priv->nbuf)%priv->video_buffer_size; + priv->video_cnt += priv->nbuf; + } + + } +} - priv->queue++; +static double grab_video_frame(priv_t *priv, char *buffer, int len) +{ + double interval; - gettimeofday(&curtime, NULL); - timestamp=curtime.tv_sec + curtime.tv_usec*.000001; - - mp_dbg(MSGT_TV, MSGL_DBG3, "mmap: %p + offset: %d => %p\n", - priv->mmap, priv->mbuf.offsets[frame], - priv->mmap+priv->mbuf.offsets[frame]); - - /* XXX also directrendering would be nicer! */ - /* 3 times copying the same picture to other buffer :( */ - - /* copy the actual frame */ - memcpy(buffer, priv->mmap+priv->mbuf.offsets[frame], len); + while (priv->video_head == priv->video_tail) { + usleep(10000); + } - return(timestamp-priv->starttime); + interval = priv->video_timebuffer[priv->video_head]; + fast_memcpy(buffer, priv->video_ringbuffer+priv->video_head*priv->bytesperline * priv->height, len); + priv->video_cnt--; + priv->video_head = (++priv->video_head)%priv->video_buffer_size; + + // compensate for audio skew + // negative skew => there are more audio samples, increase interval + // positive skew => less samples, shorten the interval + +// mp_msg(MSGT_TV, MSGL_ERR, "audio skew = %20.10lf, \n", priv->audio_skew); +// mp_msg(MSGT_TV, MSGL_ERR, "video cnt = %d\n", priv->video_cnt); + return interval - priv->audio_skew; } static int get_video_framesize(priv_t *priv) @@ -872,6 +1010,45 @@ return(priv->bytesperline * priv->height); } +void *audio_grabber(void *data) +{ + priv_t *priv = (priv_t*)data; + struct timeval tv; + int ret; + + fd_set rfds; + + for (;!priv->shutdown;) + { + FD_ZERO(&rfds); + FD_SET(priv->audio_fd, &rfds); + tv.tv_sec = 5; + tv.tv_usec = 0; + + ret = select(priv->audio_fd+1, &rfds, NULL, NULL, &tv); + + if (ret) { + priv->audio_empty = 0; + gettimeofday(&tv, NULL); + priv->audio_recv_bytes_total += priv->audio_blocksize; + priv->audio_recv_blocks_total++; + priv->audio_skew_total += tv.tv_sec + tv.tv_usec*.000001 - priv->starttime + - priv->audio_secs_per_byte*priv->audio_recv_bytes_total; + // current skew = average of all skews * 2 (assuming linear change) + priv->audio_skew = priv->audio_skew_total/priv->audio_recv_blocks_total*2; + if ((priv->audio_tail+1) % priv->audio_buffer_size == priv->audio_head) { + mp_msg(MSGT_TV, MSGL_ERR, "too bad - dropping audio frame !\n"); + priv->audio_drop++; + } else { + ret = read(priv->audio_fd, priv->audio_ringbuffer+priv->audio_tail*priv->audio_blocksize, priv->audio_blocksize); + priv->audio_tail = (++priv->audio_tail) % priv->audio_buffer_size; + priv->audio_cnt++; + } + } + } + +} + static double grab_audio_frame(priv_t *priv, char *buffer, int len) { int in_len = 0; @@ -879,24 +1056,24 @@ mp_dbg(MSGT_TV, MSGL_DBG2, "grab_audio_frame(priv=%p, buffer=%p, len=%d)\n", priv, buffer, len); - - while (--max_tries > 0) -// for (;;) - { - in_len = read(priv->audio_fd, buffer, len); -// printf("in_len: %d\n", in_len); -// fflush(NULL); - - if (in_len > 0) - break; - if (!((in_len == 0) || (in_len == -1 && (errno == EAGAIN || errno == EINTR)))) - { - in_len = 0; /* -EIO */ - break; - } - } - return 0; //(in_len); // FIXME! + // compensate for dropped audio frames + if (priv->audio_drop && (priv->audio_head == priv->audio_tail)) { + priv->audio_drop--; + priv->audio_sent_bytes_total += len; + memset(buffer, 0, len); + return (double)priv->audio_sent_bytes_total*priv->audio_secs_per_byte; + } + + while (priv->audio_head == priv->audio_tail) { + usleep(10000); + } + fast_memcpy(buffer, priv->audio_ringbuffer+priv->audio_head*priv->audio_blocksize, len); + priv->audio_head = (++priv->audio_head) % priv->audio_buffer_size; + priv->audio_cnt--; + priv->audio_sent_bytes_total += len; +// fprintf(stderr, "audio skew = %20.10lf s\n", priv->audio_skew); + return (double)priv->audio_sent_bytes_total*priv->audio_secs_per_byte; } static int get_audio_framesize(priv_t *priv)