mplayer.hg: libmpdemux/tvi_v4l2.c comparison

comparison libmpdemux/tvi_v4l2.c @ 10653:d9dfbe5e1011

a/v sync improvements

author	henry
date	Mon, 18 Aug 2003 09:23:07 +0000
parents	dd2572331142
children	1d991eb5cf02

comparison

equal deleted inserted replaced

-:b04560162c1f
+:d9dfbe5e1011
 long long                   audio_start_time;
 int                         audio_buffer_size;
 int                         aud_skew_cnt;
 unsigned char		*audio_ringbuffer;
 long long			*audio_skew_buffer;
+long long			*audio_skew_delta_buffer;
 volatile int		audio_head;
 volatile int		audio_tail;
 volatile int		audio_cnt;
 volatile long long          audio_skew;
 volatile double             audio_skew_factor;
 volatile int                audio_drop;
 volatile int                shutdown;
 double                      audio_secs_per_block;
 long long                   audio_skew_total;
+long long                   audio_skew_delta_total;
 long			audio_recv_blocks_total;
 long			audio_sent_blocks_total;
 } priv_t;
 #include "tvi_def.h"
 if (!tv_param_noaudio) {
 	if (priv->audio_ringbuffer)
 	    free(priv->audio_ringbuffer);
 	if (priv->audio_skew_buffer)
 	    free(priv->audio_skew_buffer);
+	if (priv->audio_skew_delta_buffer)
+	    free(priv->audio_skew_delta_buffer);
 }
 /* show some nice statistics ;-) */
 mp_msg(MSGT_TV, MSGL_INFO,
 	   "%s: %d frames successfully processed, %d frames dropped.\n",
 if (tv_param_immediate == 1)
 	tv_param_noaudio = 1;
 priv->audio_ringbuffer = NULL;
 priv->audio_skew_buffer = NULL;
+priv->audio_skew_delta_buffer = NULL;
 /* Open the video device. */
 priv->video_fd = open(priv->video_dev, O_RDWR);
 if (priv->video_fd < 0) {
 	mp_msg(MSGT_TV, MSGL_ERR, "%s: unable to open '%s': %s\n",
 	priv->audio_skew_buffer = (long long*)malloc(sizeof(long long)*priv->aud_skew_cnt);
 	if (!priv->audio_skew_buffer) {
 	    mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate skew buffer: %s\n", strerror(errno));
 	    return 0;
 	}
+	priv->audio_skew_delta_buffer = (long long*)malloc(sizeof(long long)*priv->aud_skew_cnt);
+	if (!priv->audio_skew_delta_buffer) {
+	    mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate skew buffer: %s\n", strerror(errno));
+	    return 0;
+	}
 	priv->audio_ringbuffer = (unsigned char*)malloc(priv->audio_in.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;
 	priv->audio_tail = 0;
 	priv->audio_cnt = 0;
 	priv->audio_drop = 0;
 	priv->audio_skew = 0;
 	priv->audio_skew_total = 0;
+	priv->audio_skew_delta_total = 0;
 	priv->audio_recv_blocks_total = 0;
 	priv->audio_sent_blocks_total = 0;
 }
 /* setup video parameters */
 static void *audio_grabber(void *data)
 {
 priv_t *priv = (priv_t*)data;
 struct timeval tv;
 int i, audio_skew_ptr = 0;
-long long current_time, prev_skew = 0;
+long long current_time, prev_skew = 0, prev_skew_uncorr = 0;
 gettimeofday(&tv, NULL);
 priv->audio_start_time = (long long)1e6*tv.tv_sec + tv.tv_usec;
 audio_in_start_capture(&priv->audio_in);
 for (i = 0; i < priv->aud_skew_cnt; i++)
 	priv->audio_skew_buffer[i] = 0;
+for (i = 0; i < priv->aud_skew_cnt; i++)
+	priv->audio_skew_delta_buffer[i] = 0;
 for (; !priv->shutdown;)
 {
 //	read_doublespeed(priv);
 	if (audio_in_read_chunk(&priv->audio_in, priv->audio_ringbuffer+priv->audio_tail*priv->audio_in.blocksize) < 0)
 	priv->audio_skew_total -= priv->audio_skew_buffer[audio_skew_ptr];
 	priv->audio_skew_buffer[audio_skew_ptr] = current_time
 	    - 1e6*priv->audio_secs_per_block*priv->audio_recv_blocks_total;
 	priv->audio_skew_total += priv->audio_skew_buffer[audio_skew_ptr];
-	audio_skew_ptr = (audio_skew_ptr+1) % priv->aud_skew_cnt;
 	pthread_mutex_lock(&priv->skew_mutex);
 	// linear interpolation - here we interpolate current skew value
 	// from the moving average, which we expect to be in the middle
 	// of the interval
 	if (priv->audio_recv_blocks_total > priv->aud_skew_cnt) {
 	    priv->audio_skew = priv->audio_skew_total/priv->aud_skew_cnt;
-	    priv->audio_skew += (priv->audio_skew*priv->aud_skew_cnt)/(2*priv->audio_recv_blocks_total-priv->aud_skew_cnt);
+//	    priv->audio_skew += (priv->audio_skew*priv->aud_skew_cnt)/(2*priv->audio_recv_blocks_total-priv->aud_skew_cnt);
 	} else {
 	    // this smoothens the evolution of audio_skew at startup a bit
 	    priv->audio_skew = ((priv->aud_skew_cnt+priv->audio_recv_blocks_total)*priv->audio_skew_total)/(priv->aud_skew_cnt*priv->audio_recv_blocks_total);
 	}
-//	fprintf(stderr, "audio_skew = %lf\n", (double)priv->audio_skew/1e6);
+	priv->audio_skew_delta_total -= priv->audio_skew_delta_buffer[audio_skew_ptr];
+	priv->audio_skew_delta_buffer[audio_skew_ptr] = priv->audio_skew - prev_skew_uncorr;
+	priv->audio_skew_delta_total += priv->audio_skew_delta_buffer[audio_skew_ptr];
+	prev_skew_uncorr = priv->audio_skew;
+	audio_skew_ptr = (audio_skew_ptr+1) % priv->aud_skew_cnt;
+	priv->audio_skew += priv->audio_skew_delta_total/2;
+//	fprintf(stderr, "audio_skew = %lf, delta = %lf\n", (double)priv->audio_skew/1e6, (double)priv->audio_skew_delta_total/1e6);
 	// current skew factor (assuming linearity)
 	// used for further interpolation in video_grabber
 	// probably overkill but seems to be necessary for
 	// stress testing by dropping half of the audio frames ;)
 	// especially when using ALSA with large block sizes

Mercurial > mplayer.hg

comparison libmpdemux/tvi_v4l2.c @ 10653:d9dfbe5e1011