mplayer.hg: stream/tvi_v4l2.c comparison

comparison stream/tvi_v4l2.c @ 23886:5af94a1df41e

Removing global variables from tv:// Step 5: removing references to old globals from tvi_v4l2.c

author	voroshil
date	Sun, 29 Jul 2007 10:21:48 +0000
parents	d65439444b75
children	657236b9eacb

comparison

equal deleted inserted replaced

-:ed7579c21164
+:5af94a1df41e
 static void init_audio(priv_t *priv)
 {
 if (priv->audio_inited) return;
-if (!tv_param_noaudio) {
+if (!priv->tv_param->noaudio) {
 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
-if (tv_param_alsa)
+if (priv->tv_param->alsa)
 audio_in_init(&priv->audio_in, AUDIO_IN_ALSA);
 else
 audio_in_init(&priv->audio_in, AUDIO_IN_OSS);
 #else
 audio_in_init(&priv->audio_in, AUDIO_IN_OSS);
 audio_in_set_channels(&priv->audio_in, 2);
 } else {
 audio_in_set_channels(&priv->audio_in, 1);
 }
 } else {
-if (tv_param_forcechan >= 0) {
+if (priv->tv_param->forcechan >= 0) {
-audio_in_set_channels(&priv->audio_in, tv_param_forcechan);
+audio_in_set_channels(&priv->audio_in, priv->tv_param->forcechan);
 } else {
 audio_in_set_channels(&priv->audio_in, 2);
 }
 }
 switch(cmd) {
 case TVI_CONTROL_IS_VIDEO:
 return priv->capability.capabilities & V4L2_CAP_VIDEO_CAPTURE?
 TVI_CONTROL_TRUE: TVI_CONTROL_FALSE;
 case TVI_CONTROL_IS_AUDIO:
-if (tv_param_force_audio) return TVI_CONTROL_TRUE;
+if (priv->tv_param->force_audio) return TVI_CONTROL_TRUE;
 case TVI_CONTROL_IS_TUNER:
 return priv->capability.capabilities & V4L2_CAP_TUNER?
 TVI_CONTROL_TRUE: TVI_CONTROL_FALSE;
 case TVI_CONTROL_IMMEDIATE:
 priv->immediate_mode = 1;
 info.short_name, strerror(errno));
 }
 }
 /* stop audio thread */
-if (!tv_param_noaudio && priv->audio_grabber_thread) {
+if (!priv->tv_param->noaudio && priv->audio_grabber_thread) {
 pthread_join(priv->audio_grabber_thread, NULL);
 pthread_mutex_destroy(&priv->skew_mutex);
 pthread_mutex_destroy(&priv->audio_mutex);
 }
 for (i = 0; i < priv->video_buffer_size_current; i++) {
 free(priv->video_ringbuffer[i].data);
 }
 free(priv->video_ringbuffer);
 }
-if (!tv_param_noaudio) {
+if (!priv->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)
 info.short_name, strerror(errno));
 uninit(priv);
 return 0;
 }
-//    if (!(priv->capability.capabilities & V4L2_CAP_AUDIO) && !tv_param_force_audio) tv_param_noaudio = 1;
+//    if (!(priv->capability.capabilities & V4L2_CAP_AUDIO) && !priv->tv_param->force_audio) priv->tv_param->noaudio = 1;
 if (priv->capability.capabilities & V4L2_CAP_TUNER) {
 struct v4l2_control control;
-if (tv_param_amode >= 0) {
+if (priv->tv_param->amode >= 0) {
 mp_msg(MSGT_TV, MSGL_V, "%s: setting audio mode\n", info.short_name);
-priv->tuner.audmode = amode2v4l(tv_param_amode);
+priv->tuner.audmode = amode2v4l(priv->tv_param->amode);
 if (ioctl(priv->video_fd, VIDIOC_S_TUNER, &priv->tuner) < 0) {
 mp_msg(MSGT_TV, MSGL_ERR, "%s: ioctl set tuner failed: %s\n",
 info.short_name, strerror(errno));
 return TVI_CONTROL_FALSE;
 }
 (priv->tuner.audmode == V4L2_TUNER_MODE_MONO)   ? " MONO"   : "",
 (priv->tuner.audmode == V4L2_TUNER_MODE_STEREO) ? " STEREO" : "",
 (priv->tuner.audmode == V4L2_TUNER_MODE_LANG1)  ? " LANG1"  : "",
 (priv->tuner.audmode == V4L2_TUNER_MODE_LANG2)  ? " LANG2"  : "");
-if (tv_param_volume >= 0) {
+if (priv->tv_param->volume >= 0) {
 control.id = V4L2_CID_AUDIO_VOLUME;
-control.value = tv_param_volume;
+control.value = priv->tv_param->volume;
 set_control(priv, &control, 0);
 }
-if (tv_param_bass >= 0) {
+if (priv->tv_param->bass >= 0) {
 control.id = V4L2_CID_AUDIO_BASS;
-control.value = tv_param_bass;
+control.value = priv->tv_param->bass;
 set_control(priv, &control, 0);
 }
-if (tv_param_treble >= 0) {
+if (priv->tv_param->treble >= 0) {
 control.id = V4L2_CID_AUDIO_TREBLE;
-control.value = tv_param_treble;
+control.value = priv->tv_param->treble;
 set_control(priv, &control, 0);
 }
-if (tv_param_balance >= 0) {
+if (priv->tv_param->balance >= 0) {
 control.id = V4L2_CID_AUDIO_BALANCE;
-control.value = tv_param_balance;
+control.value = priv->tv_param->balance;
 set_control(priv, &control, 0);
 }
 }
 return 1;
 static int get_capture_buffer_size(priv_t *priv)
 {
 int bufsize, cnt;
-if (tv_param_buffer_size >= 0) {
+if (priv->tv_param->buffer_size >= 0) {
-bufsize = tv_param_buffer_size*1024*1024;
+bufsize = priv->tv_param->buffer_size*1024*1024;
 } else {
 #ifdef HAVE_SYS_SYSINFO_H
 struct sysinfo si;
 sysinfo(&si);
 int i;
 /* setup audio parameters */
 init_audio(priv);
-if (!tv_param_noaudio && !priv->audio_inited) return 0;
+if (!priv->tv_param->noaudio && !priv->audio_inited) return 0;
 /* we need this to size the audio buffer properly */
 if (priv->immediate_mode) {
 priv->video_buffer_size_max = 2;
 } else {
 priv->video_buffer_size_max = get_capture_buffer_size(priv);
 }
-if (!tv_param_noaudio) {
+if (!priv->tv_param->noaudio) {
 setup_audio_buffer_sizes(priv);
 priv->audio_skew_buffer = calloc(priv->aud_skew_cnt, sizeof(long long));
 if (!priv->audio_skew_buffer) {
 mp_msg(MSGT_TV, MSGL_ERR, "cannot allocate skew buffer: %s\n", strerror(errno));
 return 0;
 pthread_mutex_init(&priv->skew_mutex, NULL);
 pthread_mutex_init(&priv->audio_mutex, NULL);
 }
 /* setup video parameters */
-if (!tv_param_noaudio) {
+if (!priv->tv_param->noaudio) {
 if (priv->video_buffer_size_max < (3*priv->standard.frameperiod.denominator) /
 priv->standard.frameperiod.numerator
 *priv->audio_secs_per_block) {
 mp_msg(MSGT_TV, MSGL_ERR, "Video buffer shorter than 3 times audio frame duration.\n"
 "You will probably experience heavy framedrops.\n");
 // copies a video frame
 static inline void copy_frame(priv_t *priv, video_buffer_entry *dest, unsigned char *source,int len)
 {
 dest->framesize=len;
-if(tv_param_automute>0){
+if(priv->tv_param->automute>0){
 if (ioctl(priv->video_fd, VIDIOC_G_TUNER, &priv->tuner) >= 0) {
-if(tv_param_automute<<8>priv->tuner.signal){
+if(priv->tv_param->automute<<8>priv->tuner.signal){
 	        fill_blank_frame(dest->data,dest->framesize,fcc_vl2mp(priv->format.fmt.pix.pixelformat));
 	        set_mute(priv,1);
 	        return;
 	    }
 }
 info.short_name, strerror(errno));
 return 0;
 }
 priv->streamon = 1;
-if (!tv_param_noaudio) {
+if (!priv->tv_param->noaudio) {
 pthread_create(&priv->audio_grabber_thread, NULL, audio_grabber, priv);
 }
 for (priv->frames = 0; !priv->shutdown;)
 {
 continue;
 }
 /* store the timestamp of the very first frame as reference */
 if (!priv->frames++) {
-if (!tv_param_noaudio) pthread_mutex_lock(&priv->skew_mutex);
+if (!priv->tv_param->noaudio) pthread_mutex_lock(&priv->skew_mutex);
 priv->first_frame = (long long)1e6*buf.timestamp.tv_sec + buf.timestamp.tv_usec;
-if (!tv_param_noaudio) pthread_mutex_unlock(&priv->skew_mutex);
+if (!priv->tv_param->noaudio) pthread_mutex_unlock(&priv->skew_mutex);
 }
 priv->curr_frame = (long long)buf.timestamp.tv_sec*1e6+buf.timestamp.tv_usec;
 //        fprintf(stderr, "idx = %d, ts = %lf\n", buf.index, (double)(priv->curr_frame) / 1e6);
 interval = priv->curr_frame - priv->first_frame;
 delta = interval - prev_interval;
 if (!priv->immediate_mode) {
 // interpolate the skew in time
-if (!tv_param_noaudio) pthread_mutex_lock(&priv->skew_mutex);
+if (!priv->tv_param->noaudio) pthread_mutex_lock(&priv->skew_mutex);
 xskew = priv->audio_skew + (interval - priv->audio_skew_measure_time)*priv->audio_skew_factor;
-if (!tv_param_noaudio) pthread_mutex_unlock(&priv->skew_mutex);
+if (!priv->tv_param->noaudio) pthread_mutex_unlock(&priv->skew_mutex);
 // correct extreme skew changes to avoid (especially) moving backwards in time
 if (xskew - prev_skew > delta*MAX_SKEW_DELTA) {
 skew = prev_skew + delta*MAX_SKEW_DELTA;
 } else if (xskew - prev_skew < -delta*MAX_SKEW_DELTA) {
 skew = prev_skew - delta*MAX_SKEW_DELTA;

Mercurial > mplayer.hg

comparison stream/tvi_v4l2.c @ 23886:5af94a1df41e