diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-28 14:20:44 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-28 14:20:44 +0000 |
commit | e42b714cb1abfdb44954b67347d9af32297e3227 (patch) | |
tree | cea8c547bb91f6066b42ba1f77d3853686ac125b | |
parent | faaae44a1ef8328a716e8f3a494cbe829691d942 (diff) | |
download | mpv-e42b714cb1abfdb44954b67347d9af32297e3227.tar.bz2 mpv-e42b714cb1abfdb44954b67347d9af32297e3227.tar.xz |
cosmetics: Remove all trailing whitespace and tabs, indentation fixes.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23159 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | stream/tvi_v4l.c | 2184 |
1 files changed, 1089 insertions, 1095 deletions
diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index aaa12c5260..4327bc0f90 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -2,14 +2,14 @@ Video 4 Linux input (C) Alex Beregszaszi - + Some ideas are based on xawtv/libng's grab-v4l.c written by Gerd Knorr <kraxel@bytesex.org> Multithreading, a/v sync and native ALSA support by Jindrich Makovicka <makovick@gmail.com> - Mjpeg hardware encoding support by + Mjpeg hardware encoding support by Ivan Szanto <szivan@freemail.hu> CODE IS UNDER DEVELOPMENT, NO FEATURE REQUESTS PLEASE! @@ -51,11 +51,11 @@ static tvi_handle_t *tvi_init_v4l(char *device, char *adevice); tvi_info_t tvi_info_v4l = { - tvi_init_v4l, - "Video 4 Linux input", - "v4l", - "Alex Beregszaszi", - "under development" + tvi_init_v4l, + "Video 4 Linux input", + "v4l", + "Alex Beregszaszi", + "under development" }; #define PAL_WIDTH 768 @@ -66,51 +66,51 @@ tvi_info_t tvi_info_v4l = { #define NTSC_HEIGHT 480 #define NTSC_FPS (30000.0/1001.0) -#define MAX_AUDIO_CHANNELS 10 +#define MAX_AUDIO_CHANNELS 10 -#define VID_BUF_SIZE_IMMEDIATE 2 -#define VIDEO_AVG_BUFFER_SIZE 600 +#define VID_BUF_SIZE_IMMEDIATE 2 +#define VIDEO_AVG_BUFFER_SIZE 600 typedef struct { /* general */ - char *video_device; + char *video_device; int video_fd; - struct video_capability capability; - struct video_channel *channels; - int act_channel; - struct video_tuner tuner; + struct video_capability capability; + struct video_channel *channels; + int act_channel; + struct video_tuner tuner; /* video */ - struct video_picture picture; - int format; /* output format */ - int width; - int height; - int bytesperline; - float fps; - - struct video_mbuf mbuf; + struct video_picture picture; + int format; /* output format */ + int width; + int height; + int bytesperline; + float fps; + + struct video_mbuf mbuf; unsigned char *mmap; - struct video_mmap *buf; - int nbuf; + struct video_mmap *buf; + int nbuf; /* audio */ - char *audio_device; + char *audio_device; audio_in_t audio_in; - int audio_id; - struct video_audio audio[MAX_AUDIO_CHANNELS]; - int audio_channels[MAX_AUDIO_CHANNELS]; + int audio_id; + struct video_audio audio[MAX_AUDIO_CHANNELS]; + int audio_channels[MAX_AUDIO_CHANNELS]; /* buffering stuff */ int immediate_mode; int audio_buffer_size; int aud_skew_cnt; - unsigned char *audio_ringbuffer; - long long *audio_skew_buffer; - volatile int audio_head; - volatile int audio_tail; - volatile int audio_cnt; + unsigned char *audio_ringbuffer; + long long *audio_skew_buffer; + volatile int audio_head; + volatile int audio_tail; + volatile int audio_cnt; volatile long long audio_skew; volatile double audio_skew_factor; volatile long long audio_skew_measure_time; @@ -119,19 +119,19 @@ typedef struct { int first; int video_buffer_size_max; volatile int video_buffer_size_current; - unsigned char **video_ringbuffer; + unsigned char **video_ringbuffer; long long *video_timebuffer; long long *video_avg_buffer; - int video_avg_ptr; - int video_interval_sum; - volatile int video_head; - volatile int video_tail; - volatile int video_cnt; + int video_avg_ptr; + int video_interval_sum; + 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; + pthread_t audio_grabber_thread; + pthread_t video_grabber_thread; pthread_mutex_t audio_starter; pthread_mutex_t skew_mutex; pthread_mutex_t video_buffer_mutex; @@ -139,10 +139,10 @@ typedef struct { long long starttime; double audio_secs_per_block; long long audio_skew_total; - long audio_recv_blocks_total; - long audio_sent_blocks_total; + long audio_recv_blocks_total; + long audio_sent_blocks_total; long mjpeg_bufsize; - + } priv_t; #include "tvi_def.h" @@ -164,15 +164,15 @@ static const char *norm2name(int mode) { switch (mode) { case VIDEO_MODE_PAL: - return "pal"; + return "pal"; case VIDEO_MODE_SECAM: - return "secam"; + return "secam"; case VIDEO_MODE_NTSC: - return "ntsc"; + return "ntsc"; case VIDEO_MODE_AUTO: - return "auto"; + return "auto"; default: - return "unknown"; + return "unknown"; } }; @@ -180,15 +180,15 @@ static const char *audio_mode2name(int mode) { switch (mode) { case VIDEO_SOUND_MONO: - return "mono"; + return "mono"; case VIDEO_SOUND_STEREO: - return "stereo"; + return "stereo"; case VIDEO_SOUND_LANG1: - return "language1"; + return "language1"; case VIDEO_SOUND_LANG2: - return "language2"; + return "language2"; default: - return "unknown"; + return "unknown"; } }; @@ -199,28 +199,28 @@ static int palette2depth(int palette) { switch(palette) { - /* component */ - case VIDEO_PALETTE_RGB555: - return(15); - case VIDEO_PALETTE_RGB565: - return(16); - case VIDEO_PALETTE_RGB24: - return(24); - case VIDEO_PALETTE_RGB32: - return(32); - /* planar */ - case VIDEO_PALETTE_YUV411P: - case VIDEO_PALETTE_YUV420P: - case VIDEO_PALETTE_YUV410P: - return(12); - /* packed */ - case VIDEO_PALETTE_YUV422P: - case VIDEO_PALETTE_YUV422: - case VIDEO_PALETTE_YUYV: - case VIDEO_PALETTE_UYVY: - case VIDEO_PALETTE_YUV420: - case VIDEO_PALETTE_YUV411: - return(16); + /* component */ + case VIDEO_PALETTE_RGB555: + return(15); + case VIDEO_PALETTE_RGB565: + return(16); + case VIDEO_PALETTE_RGB24: + return(24); + case VIDEO_PALETTE_RGB32: + return(32); + /* planar */ + case VIDEO_PALETTE_YUV411P: + case VIDEO_PALETTE_YUV420P: + case VIDEO_PALETTE_YUV410P: + return(12); + /* packed */ + case VIDEO_PALETTE_YUV422P: + case VIDEO_PALETTE_YUV422: + case VIDEO_PALETTE_YUYV: + case VIDEO_PALETTE_UYVY: + case VIDEO_PALETTE_YUV420: + case VIDEO_PALETTE_YUV411: + return(16); } return(-1); } @@ -229,19 +229,19 @@ static int format2palette(int format) { switch(format) { - case IMGFMT_BGR15: - return(VIDEO_PALETTE_RGB555); - case IMGFMT_BGR16: - return(VIDEO_PALETTE_RGB565); - case IMGFMT_BGR24: - return(VIDEO_PALETTE_RGB24); - case IMGFMT_BGR32: - return(VIDEO_PALETTE_RGB32); - case IMGFMT_YV12: - case IMGFMT_I420: - return(VIDEO_PALETTE_YUV420P); - case IMGFMT_YUY2: - return(VIDEO_PALETTE_YUV422); + case IMGFMT_BGR15: + return(VIDEO_PALETTE_RGB555); + case IMGFMT_BGR16: + return(VIDEO_PALETTE_RGB565); + case IMGFMT_BGR24: + return(VIDEO_PALETTE_RGB24); + case IMGFMT_BGR32: + return(VIDEO_PALETTE_RGB32); + case IMGFMT_YV12: + case IMGFMT_I420: + return(VIDEO_PALETTE_YUV420P); + case IMGFMT_YUY2: + return(VIDEO_PALETTE_YUV422); case IMGFMT_UYVY: return(VIDEO_PALETTE_UYVY); } @@ -255,48 +255,48 @@ static void setup_audio_buffer_sizes(priv_t *priv) // make the audio buffer at least 5 seconds long priv->audio_buffer_size = 1 + 5*priv->audio_in.samplerate - *priv->audio_in.channels - *bytes_per_sample/priv->audio_in.blocksize; + *priv->audio_in.channels + *bytes_per_sample/priv->audio_in.blocksize; if (priv->audio_buffer_size < 256) priv->audio_buffer_size = 256; // make the skew buffer at least 1 second long priv->aud_skew_cnt = 1 + 1*priv->audio_in.samplerate - *priv->audio_in.channels - *bytes_per_sample/priv->audio_in.blocksize; + *priv->audio_in.channels + *bytes_per_sample/priv->audio_in.blocksize; if (priv->aud_skew_cnt < 16) priv->aud_skew_cnt = 16; mp_msg(MSGT_TV, MSGL_V, "Audio capture - buffer %d blocks of %d bytes, skew average from %d meas.\n", - priv->audio_buffer_size, priv->audio_in.blocksize, priv->aud_skew_cnt); + priv->audio_buffer_size, priv->audio_in.blocksize, priv->aud_skew_cnt); } static tvi_handle_t *tvi_init_v4l(char *device, char *adevice) { tvi_handle_t *h; priv_t *priv; - + h = new_handle(); if (!h) - return(NULL); + return(NULL); priv = h->priv; /* set video device name */ if (!device) - priv->video_device = strdup("/dev/video0"); + priv->video_device = strdup("/dev/video0"); else - priv->video_device = strdup(device); + priv->video_device = strdup(device); /* set video device name */ if (!adevice) - priv->audio_device = NULL; + priv->audio_device = NULL; else { - priv->audio_device = strdup(adevice); + priv->audio_device = strdup(adevice); } - + /* allocation failed */ if (!priv->video_device) { - free_handle(h); - return(NULL); + free_handle(h); + return(NULL); } return(h); @@ -317,96 +317,96 @@ static void init_v4l_audio(priv_t *priv) mp_msg(MSGT_TV, MSGL_V, "Video capture card reports the audio setup as follows:\n"); for (i = 0; i < priv->capability.audios; i++) { - if (i >= MAX_AUDIO_CHANNELS) - { - mp_msg(MSGT_TV, MSGL_ERR, "no space for more audio channels (increase in source!) (%d > %d)\n", - i, MAX_AUDIO_CHANNELS); - i = priv->capability.audios; - break; - } - - priv->audio[i].audio = i; - if (ioctl(priv->video_fd, VIDIOCGAUDIO, &priv->audio[i]) == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get audio failed: %s\n", strerror(errno)); - break; - } - - /* mute all channels */ - priv->audio[i].flags |= VIDEO_AUDIO_MUTE; - reqmode = -1; - if (tv_param_amode >= 0) { - switch (tv_param_amode) { - case 0: - reqmode = VIDEO_SOUND_MONO; - break; - case 1: - reqmode = VIDEO_SOUND_STEREO; - break; - case 2: - reqmode = VIDEO_SOUND_LANG1; - break; - case 3: - reqmode = VIDEO_SOUND_LANG2; - break; - default: - mp_msg(MSGT_TV, MSGL_ERR, "Unknown audio mode requested.\n"); - break; - } - if (reqmode >= 0) priv->audio[i].mode = reqmode; - } - ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[i]); - - // get the parameters back - if (ioctl(priv->video_fd, VIDIOCGAUDIO, &priv->audio[i]) == -1) - { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get audio failed: %s\n", strerror(errno)); - break; - } - - switch(priv->audio[i].mode) - { - case VIDEO_SOUND_MONO: - case VIDEO_SOUND_LANG1: - case VIDEO_SOUND_LANG2: - priv->audio_channels[i] = 1; - break; - case VIDEO_SOUND_STEREO: - priv->audio_channels[i] = 2; - break; - default: - mp_msg(MSGT_TV, MSGL_ERR, "Card reports an unknown audio mode !\n"); - mp_msg(MSGT_TV, MSGL_ERR, "Trying two channel audio. Use forcechan to override.\n"); - priv->audio_channels[i] = 2; - break; - } - - if (reqmode >= 0 && priv->audio[i].mode != reqmode) { - mp_msg(MSGT_TV, MSGL_ERR, "Audio mode setup warning!\n"); - mp_msg(MSGT_TV, MSGL_ERR, "Requested mode was %s, but v4l still reports %s.\n", - audio_mode2name(reqmode), audio_mode2name(priv->audio[i].mode)); - mp_msg(MSGT_TV, MSGL_ERR, "You may need \"forcechan\" option to force stereo/mono audio recording.\n"); - } - - /* display stuff */ - mp_msg(MSGT_TV, MSGL_V, " %d: %s: ", priv->audio[i].audio, - priv->audio[i].name); - if (priv->audio[i].flags & VIDEO_AUDIO_MUTABLE) { - mp_msg(MSGT_TV, MSGL_V, "muted=%s ", - (priv->audio[i].flags & VIDEO_AUDIO_MUTE) ? "yes" : "no"); - } - mp_msg(MSGT_TV, MSGL_V, "vol=%d bass=%d treble=%d balance=%d mode=%s", - priv->audio[i].volume, priv->audio[i].bass, priv->audio[i].treble, - priv->audio[i].balance, audio_mode2name(priv->audio[i].mode)); - mp_msg(MSGT_TV, MSGL_V, " chan=%d\n", priv->audio_channels[i]); - - if (tv_param_forcechan >= 0) - priv->audio_channels[i] = tv_param_forcechan; - - // we'll call VIDIOCSAUDIO again when starting capture - // let's set audio mode to requested mode again for the case - // when VIDIOCGAUDIO just cannot report the mode correctly - if (reqmode >= 0) priv->audio[i].mode = reqmode; + if (i >= MAX_AUDIO_CHANNELS) + { + mp_msg(MSGT_TV, MSGL_ERR, "no space for more audio channels (increase in source!) (%d > %d)\n", + i, MAX_AUDIO_CHANNELS); + i = priv->capability.audios; + break; + } + + priv->audio[i].audio = i; + if (ioctl(priv->video_fd, VIDIOCGAUDIO, &priv->audio[i]) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get audio failed: %s\n", strerror(errno)); + break; + } + + /* mute all channels */ + priv->audio[i].flags |= VIDEO_AUDIO_MUTE; + reqmode = -1; + if (tv_param_amode >= 0) { + switch (tv_param_amode) { + case 0: + reqmode = VIDEO_SOUND_MONO; + break; + case 1: + reqmode = VIDEO_SOUND_STEREO; + break; + case 2: + reqmode = VIDEO_SOUND_LANG1; + break; + case 3: + reqmode = VIDEO_SOUND_LANG2; + break; + default: + mp_msg(MSGT_TV, MSGL_ERR, "Unknown audio mode requested.\n"); + break; + } + if (reqmode >= 0) priv->audio[i].mode = reqmode; + } + ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[i]); + + // get the parameters back + if (ioctl(priv->video_fd, VIDIOCGAUDIO, &priv->audio[i]) == -1) + { + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get audio failed: %s\n", strerror(errno)); + break; + } + + switch(priv->audio[i].mode) + { + case VIDEO_SOUND_MONO: + case VIDEO_SOUND_LANG1: + case VIDEO_SOUND_LANG2: + priv->audio_channels[i] = 1; + break; + case VIDEO_SOUND_STEREO: + priv->audio_channels[i] = 2; + break; + default: + mp_msg(MSGT_TV, MSGL_ERR, "Card reports an unknown audio mode !\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Trying two channel audio. Use forcechan to override.\n"); + priv->audio_channels[i] = 2; + break; + } + + if (reqmode >= 0 && priv->audio[i].mode != reqmode) { + mp_msg(MSGT_TV, MSGL_ERR, "Audio mode setup warning!\n"); + mp_msg(MSGT_TV, MSGL_ERR, "Requested mode was %s, but v4l still reports %s.\n", + audio_mode2name(reqmode), audio_mode2name(priv->audio[i].mode)); + mp_msg(MSGT_TV, MSGL_ERR, "You may need \"forcechan\" option to force stereo/mono audio recording.\n"); + } + + /* display stuff */ + mp_msg(MSGT_TV, MSGL_V, " %d: %s: ", priv->audio[i].audio, + priv->audio[i].name); + if (priv->audio[i].flags & VIDEO_AUDIO_MUTABLE) { + mp_msg(MSGT_TV, MSGL_V, "muted=%s ", + (priv->audio[i].flags & VIDEO_AUDIO_MUTE) ? "yes" : "no"); + } + mp_msg(MSGT_TV, MSGL_V, "vol=%d bass=%d treble=%d balance=%d mode=%s", + priv->audio[i].volume, priv->audio[i].bass, priv->audio[i].treble, + priv->audio[i].balance, audio_mode2name(priv->audio[i].mode)); + mp_msg(MSGT_TV, MSGL_V, " chan=%d\n", priv->audio_channels[i]); + + if (tv_param_forcechan >= 0) + priv->audio_channels[i] = tv_param_forcechan; + + // we'll call VIDIOCSAUDIO again when starting capture + // let's set audio mode to requested mode again for the case + // when VIDIOCGAUDIO just cannot report the mode correctly + if (reqmode >= 0) priv->audio[i].mode = reqmode; } } @@ -429,8 +429,8 @@ static int init(priv_t *priv) int i; if (tv_param_immediate == 1) - tv_param_noaudio = 1; - + tv_param_noaudio = 1; + priv->video_ringbuffer = NULL; priv->video_timebuffer = NULL; priv->video_avg_buffer = NULL; @@ -439,29 +439,29 @@ static int init(priv_t *priv) priv->video_fd = open(priv->video_device, O_RDWR); mp_msg(MSGT_TV, MSGL_DBG2, "Video fd: %d, %p\n", priv->video_fd, - priv->video_device); + 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; + mp_msg(MSGT_TV, MSGL_ERR, "unable to open '%s': %s\n", + priv->video_device, strerror(errno)); + goto err; } - + /* check for v4l2 */ if (ioctl(priv->video_fd, VIDIOC_QUERYCAP, &priv->capability) == 0) { - mp_msg(MSGT_TV, MSGL_ERR, "=================================================================\n"); - mp_msg(MSGT_TV, MSGL_ERR, " WARNING: YOU ARE USING V4L DEMUXER WITH V4L2 DRIVERS!!!\n"); - mp_msg(MSGT_TV, MSGL_ERR, " As the V4L1 compatibility layer is broken, this may not work.\n"); - mp_msg(MSGT_TV, MSGL_ERR, " If you encounter any problems, use driver=v4l2 instead.\n"); - mp_msg(MSGT_TV, MSGL_ERR, " Bugreports on driver=v4l with v4l2 drivers will be ignored.\n"); - mp_msg(MSGT_TV, MSGL_ERR, "=================================================================\n"); + mp_msg(MSGT_TV, MSGL_ERR, "=================================================================\n"); + mp_msg(MSGT_TV, MSGL_ERR, " WARNING: YOU ARE USING V4L DEMUXER WITH V4L2 DRIVERS!!!\n"); + mp_msg(MSGT_TV, MSGL_ERR, " As the V4L1 compatibility layer is broken, this may not work.\n"); + mp_msg(MSGT_TV, MSGL_ERR, " If you encounter any problems, use driver=v4l2 instead.\n"); + mp_msg(MSGT_TV, MSGL_ERR, " Bugreports on driver=v4l with v4l2 drivers will be ignored.\n"); + mp_msg(MSGT_TV, MSGL_ERR, "=================================================================\n"); } - + /* 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; + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + goto err; } fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC); @@ -469,13 +469,13 @@ static int init(priv_t *priv) 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]); + 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->capability.minwidth, priv->capability.minheight, + priv->capability.maxwidth, priv->capability.maxheight); priv->width = priv->capability.minwidth; priv->height = priv->capability.minheight; @@ -483,151 +483,150 @@ static int init(priv_t *priv) /* initialize if necessary */ if ( tv_param_mjpeg ) - { + { struct mjpeg_params bparm; struct mjpeg_requestbuffers breq; /* buffer requests */ if (ioctl(priv->video_fd, MJPIOC_G_PARAMS, &bparm) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, - " MJP: Error getting video parameters: %s\n", strerror(errno)); - goto err; + mp_msg(MSGT_TV, MSGL_ERR, + " MJP: Error getting video parameters: %s\n", strerror(errno)); + goto err; } - mp_msg(MSGT_TV, MSGL_INFO, - " MJP: previous params: x: %d, y: %d, w: %d, h: %d, decim: %d, fields: %d,\n", - bparm.img_x, bparm.img_y, bparm.img_width, bparm.img_height, - bparm.decimation, bparm.field_per_buff); + mp_msg(MSGT_TV, MSGL_INFO, + " MJP: previous params: x: %d, y: %d, w: %d, h: %d, decim: %d, fields: %d,\n", + bparm.img_x, bparm.img_y, bparm.img_width, bparm.img_height, + bparm.decimation, bparm.field_per_buff); - mp_msg(MSGT_TV, MSGL_INFO, - " MJP: HorDcm: %d, VerDcm: %d, TmpDcm: %d\n", - bparm.HorDcm, bparm.VerDcm, bparm.TmpDcm); + mp_msg(MSGT_TV, MSGL_INFO, + " MJP: HorDcm: %d, VerDcm: %d, TmpDcm: %d\n", + bparm.HorDcm, bparm.VerDcm, bparm.TmpDcm); bparm.input = tv_param_input; /* tv */ if (!strcasecmp(tv_param_norm, "pal")) - bparm.norm = 0; /* PAL */ + bparm.norm = 0; /* PAL */ else if (!strcasecmp(tv_param_norm, "ntsc")) - bparm.norm = 1; /* NTSC */ + bparm.norm = 1; /* NTSC */ else if (!strcasecmp(tv_param_norm, "secam")) - bparm.norm = 2; /* SECAM */ + bparm.norm = 2; /* SECAM */ bparm.quality = tv_param_quality; bparm.decimation = tv_param_decimation; - mp_msg(MSGT_TV, MSGL_INFO, " MJP: setting params to decimation: %d, quality: %d\n", - bparm.decimation, bparm.quality); + mp_msg(MSGT_TV, MSGL_INFO, " MJP: setting params to decimation: %d, quality: %d\n", + bparm.decimation, bparm.quality); if (ioctl(priv->video_fd, MJPIOC_S_PARAMS, &bparm) < 0) { mp_msg(MSGT_TV, MSGL_ERR, - " MJP: Error setting video parameters: %s\n", strerror(errno)); + " MJP: Error setting video parameters: %s\n", strerror(errno)); goto err; } if (ioctl(priv->video_fd, MJPIOC_G_PARAMS, &bparm) < 0) { - mp_msg(MSGT_TV, MSGL_ERR, - " MJP: Error getting video parameters: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, + " MJP: Error getting video parameters: %s\n", strerror(errno)); goto err; } - mp_msg(MSGT_TV, MSGL_INFO, - " MJP: current params: x: %d, y: %d, w: %d, h: %d, decim: %d, fields: %d,\n", - bparm.img_x, bparm.img_y, bparm.img_width, bparm.img_height, - bparm.decimation, bparm.field_per_buff); + mp_msg(MSGT_TV, MSGL_INFO, + " MJP: current params: x: %d, y: %d, w: %d, h: %d, decim: %d, fields: %d,\n", + bparm.img_x, bparm.img_y, bparm.img_width, bparm.img_height, + bparm.decimation, bparm.field_per_buff); - mp_msg(MSGT_TV, MSGL_INFO, - " MJP: HorDcm: %d, VerDcm: %d, TmpDcm: %d\n", - bparm.HorDcm, bparm.VerDcm, bparm.TmpDcm); + mp_msg(MSGT_TV, MSGL_INFO, + " MJP: HorDcm: %d, VerDcm: %d, TmpDcm: %d\n", + bparm.HorDcm, bparm.VerDcm, bparm.TmpDcm); breq.count = 64; - priv -> nbuf = breq.count; + priv -> nbuf = breq.count; priv->mbuf.frames = priv -> nbuf; priv->mjpeg_bufsize = 256*1024; - if (tv_param_buffer_size >= 0) { - priv->mjpeg_bufsize = tv_param_buffer_size*1024; - } - breq.size = priv -> mjpeg_bufsize; + if (tv_param_buffer_size >= 0) + priv->mjpeg_bufsize = tv_param_buffer_size*1024; + breq.size = priv -> mjpeg_bufsize; if (ioctl(priv->video_fd, MJPIOC_REQBUFS,&(breq)) < 0) { - mp_msg (MSGT_TV, MSGL_ERR, - " MJP: Error requesting video buffers: %s\n", strerror(errno)); - goto err; + mp_msg (MSGT_TV, MSGL_ERR, + " MJP: Error requesting video buffers: %s\n", strerror(errno)); + goto err; } mp_msg(MSGT_TV, MSGL_INFO, - " MJP: Got %ld buffers of size %ld KB\n", - breq.count, breq.size/1024); + " MJP: Got %ld buffers of size %ld KB\n", + breq.count, breq.size/1024); - priv -> mmap = mmap(0, breq.count * breq.size, - PROT_READ|PROT_WRITE, MAP_SHARED, priv->video_fd, 0); + priv -> mmap = mmap(0, breq.count * breq.size, + PROT_READ|PROT_WRITE, MAP_SHARED, priv->video_fd, 0); if (priv -> mmap == MAP_FAILED) { - mp_msg(MSGT_TV, MSGL_INFO, - " MJP: Error mapping video buffers: %s\n", strerror(errno)); - goto err; + mp_msg(MSGT_TV, MSGL_INFO, + " MJP: Error mapping video buffers: %s\n", strerror(errno)); + goto err; } - } + } mp_msg(MSGT_TV, MSGL_INFO, " Inputs: %d\n", priv->capability.channels); priv->channels = calloc(priv->capability.channels, sizeof(struct video_channel)); if (!priv->channels) - goto malloc_failed; + 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:%s)\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, - norm2name(priv->channels[i].norm)); + 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:%s)\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, + norm2name(priv->channels[i].norm)); } priv->act_channel = 0; if (!(priv->capability.type & VID_TYPE_CAPTURE)) { - mp_msg(MSGT_TV, MSGL_ERR, "Only grabbing supported (for overlay use another program)\n"); - goto err; + mp_msg(MSGT_TV, MSGL_ERR, "Only grabbing supported (for overlay use another program)\n"); + goto err; } - + if ( !tv_param_mjpeg ) { /* 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_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->mbuf.size, priv->mbuf.frames); priv->mmap = mmap(0, priv->mbuf.size, PROT_READ|PROT_WRITE, - MAP_SHARED, priv->video_fd, 0); + 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_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 = calloc(priv->nbuf, sizeof(struct video_mmap)); if (!priv->buf) - goto malloc_failed; + goto malloc_failed; memset(priv->buf, 0, priv->nbuf * sizeof(struct video_mmap)); } - + /* init v4l audio even when we don't capture */ init_v4l_audio(priv); @@ -635,48 +634,48 @@ static int init(priv_t *priv) /* audio init */ if (!tv_param_noaudio) { - + #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) - if (tv_param_alsa) - audio_in_init(&priv->audio_in, AUDIO_IN_ALSA); - else - audio_in_init(&priv->audio_in, AUDIO_IN_OSS); + if (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_init(&priv->audio_in, AUDIO_IN_OSS); #endif - if (priv->audio_device) { - audio_in_set_device(&priv->audio_in, priv->audio_device); - } - - if (tv_param_audio_id < priv->capability.audios) - priv->audio_id = tv_param_audio_id; - else - priv->audio_id = 0; - audio_in_set_samplerate(&priv->audio_in, 44100); - if (priv->capability.audios) { - audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]); - } else { - if (tv_param_forcechan >= 0) { - audio_in_set_channels(&priv->audio_in, tv_param_forcechan); - } else { - audio_in_set_channels(&priv->audio_in, 2); - } - } - if (audio_in_setup(&priv->audio_in) < 0) return 0; - setup_audio_buffer_sizes(priv); + if (priv->audio_device) { + audio_in_set_device(&priv->audio_in, priv->audio_device); + } + + if (tv_param_audio_id < priv->capability.audios) + priv->audio_id = tv_param_audio_id; + else + priv->audio_id = 0; + audio_in_set_samplerate(&priv->audio_in, 44100); + if (priv->capability.audios) { + audio_in_set_channels(&priv->audio_in, priv->audio_channels[priv->audio_id]); + } else { + if (tv_param_forcechan >= 0) { + audio_in_set_channels(&priv->audio_in, tv_param_forcechan); + } else { + audio_in_set_channels(&priv->audio_in, 2); + } + } + if (audio_in_setup(&priv->audio_in) < 0) return 0; + setup_audio_buffer_sizes(priv); } return(1); malloc_failed: if (priv->channels) - free(priv->channels); + free(priv->channels); if (priv->buf) - free(priv->buf); + free(priv->buf); err: if (priv->video_fd != -1) - close(priv->video_fd); + close(priv->video_fd); return(0); } @@ -687,56 +686,54 @@ static int uninit(priv_t *priv) mp_msg(MSGT_TV, MSGL_V, "Waiting for threads to finish... "); if (!tv_param_noaudio) { - pthread_join(priv->audio_grabber_thread, NULL); - pthread_mutex_destroy(&priv->audio_starter); - pthread_mutex_destroy(&priv->skew_mutex); + pthread_join(priv->audio_grabber_thread, NULL); + pthread_mutex_destroy(&priv->audio_starter); + pthread_mutex_destroy(&priv->skew_mutex); } pthread_mutex_destroy(&priv->video_buffer_mutex); pthread_join(priv->video_grabber_thread, NULL); mp_msg(MSGT_TV, MSGL_V, "done\n"); if (priv->capability.audios) { - priv->audio[priv->audio_id].flags |= VIDEO_AUDIO_MUTE; - ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); + priv->audio[priv->audio_id].flags |= VIDEO_AUDIO_MUTE; + ioctl(priv->video_fd, VIDIOCSAUDIO, &priv->audio[priv->audio_id]); } - + if ( tv_param_mjpeg ) - { - num = -1; + { + num = -1; if (ioctl(priv->video_fd, MJPIOC_QBUF_CAPT, &num) < 0) - { mp_msg(MSGT_TV, MSGL_ERR, "\n MJP: ioctl MJPIOC_QBUF_CAPT failed: %s\n", strerror(errno)); - } - } + } else - { - // We need to munmap as close don't close mem mappings - if(munmap(priv->mmap,priv->mbuf.size)) - mp_msg(MSGT_TV, MSGL_ERR, "Munmap failed: %s\n",strerror(errno)); - } + { + // We need to munmap as close don't close mem mappings + if(munmap(priv->mmap,priv->mbuf.size)) + mp_msg(MSGT_TV, MSGL_ERR, "Munmap failed: %s\n",strerror(errno)); + } if(close(priv->video_fd)) - mp_msg(MSGT_TV, MSGL_ERR, "Close tv failed: %s\n",strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, "Close tv failed: %s\n",strerror(errno)); audio_in_uninit(&priv->audio_in); if (priv->video_ringbuffer) { - int i; - for (i = 0; i < priv->video_buffer_size_current; i++) { - free(priv->video_ringbuffer[i]); - } - free(priv->video_ringbuffer); + int i; + for (i = 0; i < priv->video_buffer_size_current; i++) { + free(priv->video_ringbuffer[i]); + } + free(priv->video_ringbuffer); } - + if (priv->video_timebuffer) - free(priv->video_timebuffer); + free(priv->video_timebuffer); if (priv->video_avg_buffer) - free(priv->video_avg_buffer); + free(priv->video_avg_buffer); if (!tv_param_noaudio) { - if (priv->audio_ringbuffer) < |