Mercurial > mplayer.hg

comparison stream/tvi_v4l2.c @ 25962:afa125da85cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
typo fix: inited --> initialized
author diego
date Thu, 14 Feb 2008 14:23:55 +0000
parents 7d5823bd4517
children c43ce7268677
comparison
equal deleted inserted replaced
25961:354ad909efcf 25962:afa125da85cf
131 volatile double audio_skew_factor; 131 volatile double audio_skew_factor;
132 volatile long long audio_skew_measure_time; 132 volatile long long audio_skew_measure_time;
133 volatile int audio_drop; 133 volatile int audio_drop;
134 volatile int shutdown; 134 volatile int shutdown;
135 135
136 int audio_inited; 136 int audio_initialized;
137 double audio_secs_per_block; 137 double audio_secs_per_block;
138 long long audio_usecs_per_block; 138 long long audio_usecs_per_block;
139 long long audio_skew_total; 139 long long audio_skew_total;
140 long long audio_skew_delta_total; 140 long long audio_skew_delta_total;
141 long audio_recv_blocks_total; 141 long audio_recv_blocks_total;
363 priv->audio_buffer_size, priv->audio_in.blocksize, priv->aud_skew_cnt); 363 priv->audio_buffer_size, priv->audio_in.blocksize, priv->aud_skew_cnt);
364 } 364 }
365 365
366 static void init_audio(priv_t *priv) 366 static void init_audio(priv_t *priv)
367 { 367 {
368 if (priv->audio_inited) return; 368 if (priv->audio_initialized) return;
369 369
370 if (!priv->tv_param->noaudio) { 370 if (!priv->tv_param->noaudio) {
371 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) 371 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
372 if (priv->tv_param->alsa) 372 if (priv->tv_param->alsa)
373 audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); 373 audio_in_init(&priv->audio_in, AUDIO_IN_ALSA);
396 } 396 }
397 } 397 }
398 398
399 if (audio_in_setup(&priv->audio_in) < 0) return; 399 if (audio_in_setup(&priv->audio_in) < 0) return;
400 400
401 priv->audio_inited = 1; 401 priv->audio_initialized = 1;
402 } 402 }
403 } 403 }
404 404
405 #if 0 405 #if 0
406 /* 406 /*
958 return TVI_CONTROL_FALSE; 958 return TVI_CONTROL_FALSE;
959 } 959 }
960 return TVI_CONTROL_TRUE; 960 return TVI_CONTROL_TRUE;
961 case TVI_CONTROL_AUD_GET_FORMAT: 961 case TVI_CONTROL_AUD_GET_FORMAT:
962 init_audio(priv); 962 init_audio(priv);
963 if (!priv->audio_inited) return TVI_CONTROL_FALSE; 963 if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
964 *(int *)arg = AF_FORMAT_S16_LE; 964 *(int *)arg = AF_FORMAT_S16_LE;
965 mp_msg(MSGT_TV, MSGL_V, "%s: get audio format: %d\n", 965 mp_msg(MSGT_TV, MSGL_V, "%s: get audio format: %d\n",
966 info.short_name, *(int *)arg); 966 info.short_name, *(int *)arg);
967 return TVI_CONTROL_TRUE; 967 return TVI_CONTROL_TRUE;
968 case TVI_CONTROL_AUD_GET_SAMPLERATE: 968 case TVI_CONTROL_AUD_GET_SAMPLERATE:
969 init_audio(priv); 969 init_audio(priv);
970 if (!priv->audio_inited) return TVI_CONTROL_FALSE; 970 if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
971 *(int *)arg = priv->audio_in.samplerate; 971 *(int *)arg = priv->audio_in.samplerate;
972 mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplerate: %d\n", 972 mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplerate: %d\n",
973 info.short_name, *(int *)arg); 973 info.short_name, *(int *)arg);
974 return TVI_CONTROL_TRUE; 974 return TVI_CONTROL_TRUE;
975 case TVI_CONTROL_AUD_GET_SAMPLESIZE: 975 case TVI_CONTROL_AUD_GET_SAMPLESIZE:
976 init_audio(priv); 976 init_audio(priv);
977 if (!priv->audio_inited) return TVI_CONTROL_FALSE; 977 if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
978 *(int *)arg = priv->audio_in.bytes_per_sample; 978 *(int *)arg = priv->audio_in.bytes_per_sample;
979 mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplesize: %d\n", 979 mp_msg(MSGT_TV, MSGL_V, "%s: get audio samplesize: %d\n",
980 info.short_name, *(int *)arg); 980 info.short_name, *(int *)arg);
981 return TVI_CONTROL_TRUE; 981 return TVI_CONTROL_TRUE;
982 case TVI_CONTROL_AUD_GET_CHANNELS: 982 case TVI_CONTROL_AUD_GET_CHANNELS:
983 init_audio(priv); 983 init_audio(priv);
984 if (!priv->audio_inited) return TVI_CONTROL_FALSE; 984 if (!priv->audio_initialized) return TVI_CONTROL_FALSE;
985 *(int *)arg = priv->audio_in.channels; 985 *(int *)arg = priv->audio_in.channels;
986 mp_msg(MSGT_TV, MSGL_V, "%s: get audio channels: %d\n", 986 mp_msg(MSGT_TV, MSGL_V, "%s: get audio channels: %d\n",
987 info.short_name, *(int *)arg); 987 info.short_name, *(int *)arg);
988 return TVI_CONTROL_TRUE; 988 return TVI_CONTROL_TRUE;
989 case TVI_CONTROL_AUD_SET_SAMPLERATE: 989 case TVI_CONTROL_AUD_SET_SAMPLERATE:
1168 1168
1169 priv->audio_ringbuffer = NULL; 1169 priv->audio_ringbuffer = NULL;
1170 priv->audio_skew_buffer = NULL; 1170 priv->audio_skew_buffer = NULL;
1171 priv->audio_skew_delta_buffer = NULL; 1171 priv->audio_skew_delta_buffer = NULL;
1172 1172
1173 priv->audio_inited = 0; 1173 priv->audio_initialized = 0;
1174 1174
1175 /* Open the video device. */ 1175 /* Open the video device. */
1176 priv->video_fd = open(priv->video_dev, O_RDWR); 1176 priv->video_fd = open(priv->video_dev, O_RDWR);
1177 if (priv->video_fd < 0) { 1177 if (priv->video_fd < 0) {
1178 mp_msg(MSGT_TV, MSGL_ERR, "%s: unable to open '%s': %s\n", 1178 mp_msg(MSGT_TV, MSGL_ERR, "%s: unable to open '%s': %s\n",
1381 unsigned int i; 1381 unsigned int i;
1382 1382
1383 /* setup audio parameters */ 1383 /* setup audio parameters */
1384 1384
1385 init_audio(priv); 1385 init_audio(priv);
1386 if (!priv->tv_param->noaudio && !priv->audio_inited) return 0; 1386 if (!priv->tv_param->noaudio && !priv->audio_initialized) return 0;
1387 1387
1388 /* we need this to size the audio buffer properly */ 1388 /* we need this to size the audio buffer properly */
1389 if (priv->immediate_mode) { 1389 if (priv->immediate_mode) {
1390 priv->video_buffer_size_max = 2; 1390 priv->video_buffer_size_max = 2;
1391 } else { 1391 } else {