From b30e85508a305d668db8419556d295a65ab08707 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 13 Sep 2019 17:16:18 +0200 Subject: Remove classic Linux analog TV support, and DVB runtime controls Linux analog TV support (via tv://) was excessively complex, and whenever I attempted to use it (cameras or loopback devices), it didn't work well, or would have required some major work to update it. It's very much stuck in the analog past (my favorite are the frequency tables in frequencies.c for analog TV channels which don't exist anymore). Especially cameras and such work fine with libavdevice and better than tv://, for example: mpv av://v4l2:/dev/video0 (adding --profile=low-latency --untimed even makes it mostly realtime) Adding a new input layer that targets such "modern" uses would be acceptable, if anyone is interested in it. The old TV code is just too focused on actual analog TV. DVB is rather obscure, but has an active maintainer, so don't remove it. However, the demux/stream ctrl layer must go, so remove controls for channel switching. Most of these could be reimplemented by using the normal method for option runtime changes. --- stream/ai_alsa1x.c | 199 ------ stream/ai_oss.c | 153 ----- stream/ai_sndio.c | 52 -- stream/audio_in.c | 298 --------- stream/audio_in.h | 118 ---- stream/frequencies.c | 1212 ---------------------------------- stream/frequencies.h | 133 ---- stream/stream.c | 4 - stream/stream.h | 24 - stream/stream_dvb.c | 5 +- stream/stream_tv.c | 52 -- stream/tv.c | 986 ---------------------------- stream/tv.h | 285 -------- stream/tvi_def.h | 93 --- stream/tvi_dummy.c | 126 ---- stream/tvi_v4l2.c | 1786 -------------------------------------------------- 16 files changed, 4 insertions(+), 5522 deletions(-) delete mode 100644 stream/ai_alsa1x.c delete mode 100644 stream/ai_oss.c delete mode 100644 stream/ai_sndio.c delete mode 100644 stream/audio_in.c delete mode 100644 stream/audio_in.h delete mode 100644 stream/frequencies.c delete mode 100644 stream/frequencies.h delete mode 100644 stream/stream_tv.c delete mode 100644 stream/tv.c delete mode 100644 stream/tv.h delete mode 100644 stream/tvi_def.h delete mode 100644 stream/tvi_dummy.c delete mode 100644 stream/tvi_v4l2.c (limited to 'stream') diff --git a/stream/ai_alsa1x.c b/stream/ai_alsa1x.c deleted file mode 100644 index 8f2b774faf..0000000000 --- a/stream/ai_alsa1x.c +++ /dev/null @@ -1,199 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#include -#include -#include - -#include "config.h" - -#include -#include "audio_in.h" -#include "common/msg.h" - -int ai_alsa_setup(audio_in_t *ai) -{ - snd_pcm_hw_params_t *params; - snd_pcm_sw_params_t *swparams; - snd_pcm_uframes_t buffer_size, period_size; - int err; - int dir; - unsigned int rate; - - snd_pcm_hw_params_alloca(¶ms); - snd_pcm_sw_params_alloca(&swparams); - - err = snd_pcm_hw_params_any(ai->alsa.handle, params); - if (err < 0) { - MP_ERR(ai, "Broken configuration for this PCM: no configurations available.\n"); - return -1; - } - - err = snd_pcm_hw_params_set_access(ai->alsa.handle, params, - SND_PCM_ACCESS_RW_INTERLEAVED); - if (err < 0) { - MP_ERR(ai, "Access type not available.\n"); - return -1; - } - - err = snd_pcm_hw_params_set_format(ai->alsa.handle, params, SND_PCM_FORMAT_S16); - if (err < 0) { - MP_ERR(ai, "Sample format not available.\n"); - return -1; - } - - err = snd_pcm_hw_params_set_channels(ai->alsa.handle, params, ai->req_channels); - if (err < 0) { - snd_pcm_hw_params_get_channels(params, &ai->channels); - MP_ERR(ai, "Channel count not available - reverting to default: %d\n", - ai->channels); - } else { - ai->channels = ai->req_channels; - } - - dir = 0; - rate = ai->req_samplerate; - err = snd_pcm_hw_params_set_rate_near(ai->alsa.handle, params, &rate, &dir); - if (err < 0) { - MP_ERR(ai, "Cannot set samplerate.\n"); - } - ai->samplerate = rate; - - dir = 0; - ai->alsa.buffer_time = 1000000; - err = snd_pcm_hw_params_set_buffer_time_near(ai->alsa.handle, params, - &ai->alsa.buffer_time, &dir); - if (err < 0) { - MP_ERR(ai, "Cannot set buffer time.\n"); - } - - dir = 0; - ai->alsa.period_time = ai->alsa.buffer_time / 4; - err = snd_pcm_hw_params_set_period_time_near(ai->alsa.handle, params, - &ai->alsa.period_time, &dir); - if (err < 0) { - MP_ERR(ai, "Cannot set period time.\n"); - } - - err = snd_pcm_hw_params(ai->alsa.handle, params); - if (err < 0) { - MP_ERR(ai, "Unable to install hardware parameters: %s", snd_strerror(err)); - snd_pcm_hw_params_dump(params, ai->alsa.log); - return -1; - } - - dir = -1; - snd_pcm_hw_params_get_period_size(params, &period_size, &dir); - snd_pcm_hw_params_get_buffer_size(params, &buffer_size); - ai->alsa.chunk_size = period_size; - if (period_size == buffer_size) { - MP_ERR(ai, "Can't use period equal to buffer size (%u == %lu)\n", ai->alsa.chunk_size, (long)buffer_size); - return -1; - } - - snd_pcm_sw_params_current(ai->alsa.handle, swparams); - err = snd_pcm_sw_params_set_avail_min(ai->alsa.handle, swparams, ai->alsa.chunk_size); - - err = snd_pcm_sw_params_set_start_threshold(ai->alsa.handle, swparams, 0); - err = snd_pcm_sw_params_set_stop_threshold(ai->alsa.handle, swparams, buffer_size); - - if (snd_pcm_sw_params(ai->alsa.handle, swparams) < 0) { - MP_ERR(ai, "Unable to install software parameters:\n"); - snd_pcm_sw_params_dump(swparams, ai->alsa.log); - return -1; - } - - if (mp_msg_test(ai->log, MSGL_V)) { - snd_pcm_dump(ai->alsa.handle, ai->alsa.log); - } - - ai->alsa.bits_per_sample = snd_pcm_format_physical_width(SND_PCM_FORMAT_S16); - ai->alsa.bits_per_frame = ai->alsa.bits_per_sample * ai->channels; - ai->blocksize = ai->alsa.chunk_size * ai->alsa.bits_per_frame / 8; - ai->samplesize = ai->alsa.bits_per_sample; - ai->bytes_per_sample = ai->alsa.bits_per_sample/8; - - return 0; -} - -int ai_alsa_init(audio_in_t *ai) -{ - int err; - - const char *device = ai->alsa.device; - if (!device) - device = "default"; - - err = snd_pcm_open(&ai->alsa.handle, device, SND_PCM_STREAM_CAPTURE, 0); - if (err < 0) { - MP_ERR(ai, "Error opening audio: %s\n", snd_strerror(err)); - return -1; - } - - err = snd_output_stdio_attach(&ai->alsa.log, stderr, 0); - - if (err < 0) { - return -1; - } - - err = ai_alsa_setup(ai); - - return err; -} - -#ifndef timersub -#define timersub(a, b, result) \ -do { \ - (result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \ - (result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \ - if ((result)->tv_usec < 0) { \ - --(result)->tv_sec; \ - (result)->tv_usec += 1000000; \ - } \ -} while (0) -#endif - -int ai_alsa_xrun(audio_in_t *ai) -{ - snd_pcm_status_t *status; - int res; - - snd_pcm_status_alloca(&status); - if ((res = snd_pcm_status(ai->alsa.handle, status))<0) { - MP_ERR(ai, "ALSA status error: %s", snd_strerror(res)); - return -1; - } - if (snd_pcm_status_get_state(status) == SND_PCM_STATE_XRUN) { - struct timeval now, diff, tstamp; - gettimeofday(&now, 0); - snd_pcm_status_get_trigger_tstamp(status, &tstamp); - timersub(&now, &tstamp, &diff); - MP_ERR(ai, "ALSA xrun!!! (at least %.3f ms long)\n", - diff.tv_sec * 1000 + diff.tv_usec / 1000.0); - if (mp_msg_test(ai->log, MSGL_V)) { - MP_ERR(ai, "ALSA Status:\n"); - snd_pcm_status_dump(status, ai->alsa.log); - } - if ((res = snd_pcm_prepare(ai->alsa.handle))<0) { - MP_ERR(ai, "ALSA xrun: prepare error: %s", snd_strerror(res)); - return -1; - } - return 0; /* ok, data should be accepted again */ - } - MP_ERR(ai, "ALSA read/write error"); - return -1; -} diff --git a/stream/ai_oss.c b/stream/ai_oss.c deleted file mode 100644 index bc22691be5..0000000000 --- a/stream/ai_oss.c +++ /dev/null @@ -1,153 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#include -#include - -#include "config.h" - -#include -#include -#include -#include - -#include - -#include "osdep/io.h" - -#include "audio_in.h" -#include "common/common.h" -#include "common/msg.h" - -int ai_oss_set_samplerate(audio_in_t *ai) -{ - int tmp = ai->req_samplerate; - if (ioctl(ai->oss.audio_fd, SNDCTL_DSP_SPEED, &tmp) == -1) return -1; - ai->samplerate = tmp; - return 0; -} - -int ai_oss_set_channels(audio_in_t *ai) -{ - int err; - int ioctl_param; - - if (ai->req_channels > 2) - { - ioctl_param = ai->req_channels; - MP_VERBOSE(ai, "ioctl dsp channels: %d\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_CHANNELS, &ioctl_param)); - if (err < 0) { - MP_ERR(ai, "Unable to set channel count: %d\n", - ai->req_channels); - return -1; - } - ai->channels = ioctl_param; - } - else - { - ioctl_param = (ai->req_channels == 2); - MP_VERBOSE(ai, "ioctl dsp stereo: %d (req: %d)\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_STEREO, &ioctl_param), - ioctl_param); - if (err < 0) { - MP_ERR(ai, "Unable to set stereo: %d\n", - ai->req_channels == 2); - return -1; - } - ai->channels = ioctl_param ? 2 : 1; - } - return 0; -} - -int ai_oss_init(audio_in_t *ai) -{ - int err; - int ioctl_param; - - const char *device = ai->oss.device; - if (!device) - device = "/dev/dsp"; - - ai->oss.audio_fd = open(device, O_RDONLY | O_CLOEXEC); - if (ai->oss.audio_fd < 0) - { - MP_ERR(ai, "Unable to open '%s': %s\n", device, mp_strerror(errno)); - return -1; - } - - ioctl_param = 0 ; - MP_VERBOSE(ai, "ioctl dsp getfmt: %d\n", - ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETFMTS, &ioctl_param)); - - MP_VERBOSE(ai, "Supported formats: %x\n", ioctl_param); - if (!(ioctl_param & AFMT_S16_NE)) - MP_ERR(ai, "unsupported format\n"); - - ioctl_param = AFMT_S16_NE; - MP_VERBOSE(ai, "ioctl dsp setfmt: %d\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SETFMT, &ioctl_param)); - if (err < 0) { - MP_ERR(ai, "Unable to set audio format."); - return -1; - } - - if (ai_oss_set_channels(ai) < 0) return -1; - - ioctl_param = ai->req_samplerate; - MP_VERBOSE(ai, "ioctl dsp speed: %d\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SPEED, &ioctl_param)); - if (err < 0) { - MP_ERR(ai, "Unable to set samplerate: %d\n", - ai->req_samplerate); - return -1; - } - ai->samplerate = ioctl_param; - - MP_VERBOSE(ai, "ioctl dsp trigger: %d\n", - ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETTRIGGER, &ioctl_param)); - MP_VERBOSE(ai, "trigger: %x\n", ioctl_param); - ioctl_param = PCM_ENABLE_INPUT; - MP_VERBOSE(ai, "ioctl dsp trigger: %d\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_SETTRIGGER, &ioctl_param)); - if (err < 0) { - MP_ERR(ai, "Unable to set trigger: %d\n", - PCM_ENABLE_INPUT); - } - - ai->blocksize = 0; - MP_VERBOSE(ai, "ioctl dsp getblocksize: %d\n", - err = ioctl(ai->oss.audio_fd, SNDCTL_DSP_GETBLKSIZE, &ai->blocksize)); - if (err < 0) { - MP_ERR(ai, "Unable to get block size!\n"); - } - MP_VERBOSE(ai, "blocksize: %d\n", ai->blocksize); - - // correct the blocksize to a reasonable value - if (ai->blocksize <= 0) { - ai->blocksize = 4096*ai->channels*2; - MP_ERR(ai, "Audio block size is zero, setting to %d!\n", ai->blocksize); - } else if (ai->blocksize < 4096*ai->channels*2) { - ai->blocksize *= 4096*ai->channels*2/ai->blocksize; - MP_ERR(ai, "Audio block size too low, setting to %d!\n", ai->blocksize); - } - - ai->samplesize = 16; - ai->bytes_per_sample = 2; - - return 0; -} diff --git a/stream/ai_sndio.c b/stream/ai_sndio.c deleted file mode 100644 index 10e95cea62..0000000000 --- a/stream/ai_sndio.c +++ /dev/null @@ -1,52 +0,0 @@ -#include -#include - -#include "config.h" - -#include -#include "audio_in.h" -#include "common/msg.h" - -int ai_sndio_setup(audio_in_t *ai) -{ - struct sio_par par; - - sio_initpar(&par); - - par.bits = 16; - par.sig = 1; - par.le = SIO_LE_NATIVE; - par.rchan = ai->req_channels; - par.rate = ai->req_samplerate; - par.appbufsz = ai->req_samplerate; /* 1 sec */ - - if (!sio_setpar(ai->sndio.hdl, &par) || !sio_getpar(ai->sndio.hdl, &par)) { - MP_ERR(ai, "could not configure sndio audio"); - return -1; - } - - ai->channels = par.rchan; - ai->samplerate = par.rate; - ai->samplesize = par.bits; - ai->bytes_per_sample = par.bps; - ai->blocksize = par.round * par.bps; - - return 0; -} - -int ai_sndio_init(audio_in_t *ai) -{ - int err; - - const char *device = ai->sndio.device; - if (!device) - device = "default"; - if ((ai->sndio.hdl = sio_open(device, SIO_REC, 0)) == NULL) { - MP_ERR(ai, "could not open sndio audio"); - return -1; - } - - err = ai_sndio_setup(ai); - - return err; -} diff --git a/stream/audio_in.c b/stream/audio_in.c deleted file mode 100644 index 8ed92767c1..0000000000 --- a/stream/audio_in.c +++ /dev/null @@ -1,298 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#include -#include -#include - -#include "config.h" - -#include "audio_in.h" -#include "common/common.h" -#include "common/msg.h" -#include -#include - -// sanitizes ai structure before calling other functions -int audio_in_init(audio_in_t *ai, struct mp_log *log, int type) -{ - ai->type = type; - ai->setup = 0; - ai->log = log; - - ai->channels = -1; - ai->samplerate = -1; - ai->blocksize = -1; - ai->bytes_per_sample = -1; - ai->samplesize = -1; - - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - ai->alsa.handle = NULL; - ai->alsa.log = NULL; - ai->alsa.device = NULL; - return 0; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - ai->oss.audio_fd = -1; - ai->oss.device = NULL; - return 0; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - ai->sndio.hdl = NULL; - ai->sndio.device = NULL; - return 0; -#endif - default: - return -1; - } -} - -int audio_in_setup(audio_in_t *ai) -{ - - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - if (ai_alsa_init(ai) < 0) return -1; - ai->setup = 1; - return 0; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - if (ai_oss_init(ai) < 0) return -1; - ai->setup = 1; - return 0; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - if (ai_sndio_init(ai) < 0) return -1; - ai->setup = 1; - return 0; -#endif - default: - return -1; - } -} - -int audio_in_set_samplerate(audio_in_t *ai, int rate) -{ - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - ai->req_samplerate = rate; - if (!ai->setup) return 0; - if (ai_alsa_setup(ai) < 0) return -1; - return ai->samplerate; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - ai->req_samplerate = rate; - if (!ai->setup) return 0; - if (ai_oss_set_samplerate(ai) < 0) return -1; - return ai->samplerate; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - ai->req_samplerate = rate; - if (!ai->setup) return 0; - if (ai_sndio_setup(ai) < 0) return -1; - return ai->samplerate; -#endif - default: - return -1; - } -} - -int audio_in_set_channels(audio_in_t *ai, int channels) -{ - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - ai->req_channels = channels; - if (!ai->setup) return 0; - if (ai_alsa_setup(ai) < 0) return -1; - return ai->channels; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - ai->req_channels = channels; - if (!ai->setup) return 0; - if (ai_oss_set_channels(ai) < 0) return -1; - return ai->channels; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - ai->req_channels = channels; - if (!ai->setup) return 0; - if (ai_sndio_setup(ai) < 0) return -1; - return ai->channels; -#endif - default: - return -1; - } -} - -int audio_in_set_device(audio_in_t *ai, char *device) -{ -#if HAVE_ALSA - int i; -#endif - if (ai->setup) return -1; - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - free(ai->alsa.device); - ai->alsa.device = strdup(device); - if (ai->alsa.device) { - /* mplayer could not handle colons in arguments */ - for (i = 0; i < (int)strlen(ai->alsa.device); i++) { - if (ai->alsa.device[i] == '.') ai->alsa.device[i] = ':'; - } - } - return 0; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - free(ai->oss.device); - ai->oss.device = strdup(device); - return 0; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - if (ai->sndio.device) free(ai->sndio.device); - ai->sndio.device = strdup(device); - return 0; -#endif - default: - return -1; - } -} - -int audio_in_uninit(audio_in_t *ai) -{ - if (ai->setup) { - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - if (ai->alsa.log) - snd_output_close(ai->alsa.log); - if (ai->alsa.handle) { - snd_pcm_close(ai->alsa.handle); - } - ai->setup = 0; - return 0; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - close(ai->oss.audio_fd); - ai->setup = 0; - return 0; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - if (ai->sndio.hdl) - sio_close(ai->sndio.hdl); - ai->setup = 0; - return 0; -#endif - } - } - return -1; -} - -int audio_in_start_capture(audio_in_t *ai) -{ - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - return snd_pcm_start(ai->alsa.handle); -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - return 0; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - if (!sio_start(ai->sndio.hdl)) - return -1; - return 0; -#endif - default: - return -1; - } -} - -int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) -{ - int ret; - - switch (ai->type) { -#if HAVE_ALSA - case AUDIO_IN_ALSA: - ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); - if (ret != ai->alsa.chunk_size) { - if (ret < 0) { - MP_ERR(ai, "\nError reading audio: %s\n", snd_strerror(ret)); - if (ret == -EPIPE) { - if (ai_alsa_xrun(ai) == 0) { - MP_ERR(ai, "Recovered from cross-run, some frames may be left out!\n"); - } else { - MP_ERR(ai, "Fatal error, cannot recover!\n"); - } - } - } else { - MP_ERR(ai, "\nNot enough audio samples!\n"); - } - return -1; - } - return ret; -#endif -#if HAVE_OSS_AUDIO - case AUDIO_IN_OSS: - ret = read(ai->oss.audio_fd, buffer, ai->blocksize); - if (ret != ai->blocksize) { - if (ret < 0) { - MP_ERR(ai, "\nError reading audio: %s\n", mp_strerror(errno)); - - } else { - MP_ERR(ai, "\nNot enough audio samples!\n"); - } - return -1; - } - return ret; -#endif -#if HAVE_SNDIO - case AUDIO_IN_SNDIO: - ret = sio_read(ai->sndio.hdl, buffer, ai->blocksize); - if (ret != ai->blocksize) { - if (ret < 0) { - MP_ERR(ai, "\nError reading audio: %s\n", mp_strerror(errno)); - } else { - MP_ERR(ai, "\nNot enough audio samples!\n"); - } - return -1; - } - return ret; -#endif - default: - return -1; - } -} diff --git a/stream/audio_in.h b/stream/audio_in.h deleted file mode 100644 index 6b714f7306..0000000000 --- a/stream/audio_in.h +++ /dev/null @@ -1,118 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#ifndef MPLAYER_AUDIO_IN_H -#define MPLAYER_AUDIO_IN_H - -#define AUDIO_IN_ALSA 1 -#define AUDIO_IN_OSS 2 -#define AUDIO_IN_SNDIO 3 - -#include "config.h" - -#if !HAVE_GPL -#error GPL only -#endif - -struct mp_log; - -#if HAVE_ALSA -#include - -typedef struct { - char *device; - - snd_pcm_t *handle; - snd_output_t *log; - int buffer_time, period_time, chunk_size; - size_t bits_per_sample, bits_per_frame; -} ai_alsa_t; -#endif - -#if HAVE_OSS_AUDIO -typedef struct { - char *device; - - int audio_fd; -} ai_oss_t; -#endif - -#if HAVE_SNDIO -#include - -typedef struct { - char *device; - - struct sio_hdl *hdl; -} ai_sndio_t; -#endif - -typedef struct -{ - struct mp_log *log; - int type; - int setup; - - /* requested values */ - int req_channels; - int req_samplerate; - - /* real values read-only */ - int channels; - int samplerate; - int blocksize; - int bytes_per_sample; - int samplesize; - -#if HAVE_ALSA - ai_alsa_t alsa; -#endif -#if HAVE_OSS_AUDIO - ai_oss_t oss; -#endif -#if HAVE_SNDIO - ai_sndio_t sndio; -#endif -} audio_in_t; - -int audio_in_init(audio_in_t *ai, struct mp_log *log, int type); -int audio_in_setup(audio_in_t *ai); -int audio_in_set_device(audio_in_t *ai, char *device); -int audio_in_set_samplerate(audio_in_t *ai, int rate); -int audio_in_set_channels(audio_in_t *ai, int channels); -int audio_in_uninit(audio_in_t *ai); -int audio_in_start_capture(audio_in_t *ai); -int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer); - -#if HAVE_ALSA -int ai_alsa_setup(audio_in_t *ai); -int ai_alsa_init(audio_in_t *ai); -int ai_alsa_xrun(audio_in_t *ai); -#endif - -#if HAVE_OSS_AUDIO -int ai_oss_set_samplerate(audio_in_t *ai); -int ai_oss_set_channels(audio_in_t *ai); -int ai_oss_init(audio_in_t *ai); -#endif - -#if HAVE_SNDIO -int ai_sndio_setup(audio_in_t *ai); -int ai_sndio_init(audio_in_t *ai); -#endif - -#endif /* MPLAYER_AUDIO_IN_H */ diff --git a/stream/frequencies.c b/stream/frequencies.c deleted file mode 100644 index 2e4027c680..0000000000 --- a/stream/frequencies.c +++ /dev/null @@ -1,1212 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#include -#include - -#include "frequencies.h" - -/* --------------------------------------------------------------------- */ - -/* US broadcast */ -static const struct CHANLIST ntsc_bcast[] = { - { "2", 55250 }, - { "3", 61250 }, - { "4", 67250 }, - { "5", 77250 }, - { "6", 83250 }, - { "7", 175250 }, - { "8", 181250 }, - { "9", 187250 }, - { "10", 193250 }, - { "11", 199250 }, - { "12", 205250 }, - { "13", 211250 }, - { "14", 471250 }, - { "15", 477250 }, - { "16", 483250 }, - { "17", 489250 }, - { "18", 495250 }, - { "19", 501250 }, - { "20", 507250 }, - { "21", 513250 }, - { "22", 519250 }, - { "23", 525250 }, - { "24", 531250 }, - { "25", 537250 }, - { "26", 543250 }, - { "27", 549250 }, - { "28", 555250 }, - { "29", 561250 }, - { "30", 567250 }, - { "31", 573250 }, - { "32", 579250 }, - { "33", 585250 }, - { "34", 591250 }, - { "35", 597250 }, - { "36", 603250 }, - { "37", 609250 }, - { "38", 615250 }, - { "39", 621250 }, - { "40", 627250 }, - { "41", 633250 }, - { "42", 639250 }, - { "43", 645250 }, - { "44", 651250 }, - { "45", 657250 }, - { "46", 663250 }, - { "47", 669250 }, - { "48", 675250 }, - { "49", 681250 }, - { "50", 687250 }, - { "51", 693250 }, - { "52", 699250 }, - { "53", 705250 }, - { "54", 711250 }, - { "55", 717250 }, - { "56", 723250 }, - { "57", 729250 }, - { "58", 735250 }, - { "59", 741250 }, - { "60", 747250 }, - { "61", 753250 }, - { "62", 759250 }, - { "63", 765250 }, - { "64", 771250 }, - { "65", 777250 }, - { "66", 783250 }, - { "67", 789250 }, - { "68", 795250 }, - { "69", 801250 }, - - { "70", 807250 }, - { "71", 813250 }, - { "72", 819250 }, - { "73", 825250 }, - { "74", 831250 }, - { "75", 837250 }, - { "76", 843250 }, - { "77", 849250 }, - { "78", 855250 }, - { "79", 861250 }, - { "80", 867250 }, - { "81", 873250 }, - { "82", 879250 }, - { "83", 885250 }, -}; - -/* US cable */ -static const struct CHANLIST ntsc_cable[] = { - { "1", 73250 }, - { "2", 55250 }, - { "3", 61250 }, - { "4", 67250 }, - { "5", 77250 }, - { "6", 83250 }, - { "7", 175250 }, - { "8", 181250 }, - { "9", 187250 }, - { "10", 193250 }, - { "11", 199250 }, - { "12", 205250 }, - - { "13", 211250 }, - { "14", 121250 }, - { "15", 127250 }, - { "16", 133250 }, - { "17", 139250 }, - { "18", 145250 }, - { "19", 151250 }, - { "20", 157250 }, - - { "21", 163250 }, - { "22", 169250 }, - { "23", 217250 }, - { "24", 223250 }, - { "25", 229250 }, - { "26", 235250 }, - { "27", 241250 }, - { "28", 247250 }, - { "29", 253250 }, - { "30", 259250 }, - { "31", 265250 }, - { "32", 271250 }, - { "33", 277250 }, - { "34", 283250 }, - { "35", 289250 }, - { "36", 295250 }, - { "37", 301250 }, - { "38", 307250 }, - { "39", 313250 }, - { "40", 319250 }, - { "41", 325250 }, - { "42", 331250 }, - { "43", 337250 }, - { "44", 343250 }, - { "45", 349250 }, - { "46", 355250 }, - { "47", 361250 }, - { "48", 367250 }, - { "49", 373250 }, - { "50", 379250 }, - { "51", 385250 }, - { "52", 391250 }, - { "53", 397250 }, - { "54", 403250 }, - { "55", 409250 }, - { "56", 415250 }, - { "57", 421250 }, - { "58", 427250 }, - { "59", 433250 }, - { "60", 439250 }, - { "61", 445250 }, - { "62", 451250 }, - { "63", 457250 }, - { "64", 463250 }, - { "65", 469250 }, - { "66", 475250 }, - { "67", 481250 }, - { "68", 487250 }, - { "69", 493250 }, - - { "70", 499250 }, - { "71", 505250 }, - { "72", 511250 }, - { "73", 517250 }, - { "74", 523250 }, - { "75", 529250 }, - { "76", 535250 }, - { "77", 541250 }, - { "78", 547250 }, - { "79", 553250 }, - { "80", 559250 }, - { "81", 565250 }, - { "82", 571250 }, - { "83", 577250 }, - { "84", 583250 }, - { "85", 589250 }, - { "86", 595250 }, - { "87", 601250 }, - { "88", 607250 }, - { "89", 613250 }, - { "90", 619250 }, - { "91", 625250 }, - { "92", 631250 }, - { "93", 637250 }, - { "94", 643250 }, - { "95", 91250 }, - { "96", 97250 }, - { "97", 103250 }, - { "98", 109250 }, - { "99", 115250 }, - { "100", 649250 }, - { "101", 655250 }, - { "102", 661250 }, - { "103", 667250 }, - { "104", 673250 }, - { "105", 679250 }, - { "106", 685250 }, - { "107", 691250 }, - { "108", 697250 }, - { "109", 703250 }, - { "110", 709250 }, - { "111", 715250 }, - { "112", 721250 }, - { "113", 727250 }, - { "114", 733250 }, - { "115", 739250 }, - { "116", 745250 }, - { "117", 751250 }, - { "118", 757250 }, - { "119", 763250 }, - { "120", 769250 }, - { "121", 775250 }, - { "122", 781250 }, - { "123", 787250 }, - { "124", 793250 }, - { "125", 799250 }, - - { "T7", 8250 }, - { "T8", 14250 }, - { "T9", 20250 }, - { "T10", 26250 }, - { "T11", 32250 }, - { "T12", 38250 }, - { "T13", 44250 }, - { "T14", 50250 } -}; - -/* US HRC */ -static const struct CHANLIST ntsc_hrc[] = { - { "1", 72000 }, - { "2", 54000 }, - { "3", 60000 }, - { "4", 66000 }, - { "5", 78000 }, - { "6", 84000 }, - { "7", 174000 }, - { "8", 180000 }, - { "9", 186000 }, - { "10", 192000 }, - { "11", 198000 }, - { "12", 204000 }, - - { "13", 210000 }, - { "14", 120000 }, - { "15", 126000 }, - { "16", 132000 }, - { "17", 138000 }, - { "18", 144000 }, - { "19", 150000 }, - { "20", 156000 }, - - { "21", 162000 }, - { "22", 168000 }, - { "23", 216000 }, - { "24", 222000 }, - { "25", 228000 }, - { "26", 234000 }, - { "27", 240000 }, - { "28", 246000 }, - { "29", 252000 }, - { "30", 258000 }, - { "31", 264000 }, - { "32", 270000 }, - { "33", 276000 }, - { "34", 282000 }, - { "35", 288000 }, - { "36", 294000 }, - { "37", 300000 }, - { "38", 306000 }, - { "39", 312000 }, - { "40", 318000 }, - { "41", 324000 }, - { "42", 330000 }, - { "43", 336000 }, - { "44", 342000 }, - { "45", 348000 }, - { "46", 354000 }, - { "47", 360000 }, - { "48", 366000 }, - { "49", 372000 }, - { "50", 378000 }, - { "51", 384000 }, - { "52", 390000 }, - { "53", 396000 }, - { "54", 402000 }, - { "55", 408000 }, - { "56", 414000 }, - { "57", 420000 }, - { "58", 426000 }, - { "59", 432000 }, - { "60", 438000 }, - { "61", 444000 }, - { "62", 450000 }, - { "63", 456000 }, - { "64", 462000 }, - { "65", 468000 }, - { "66", 474000 }, - { "67", 480000 }, - { "68", 486000 }, - { "69", 492000 }, - - { "70", 498000 }, - { "71", 504000 }, - { "72", 510000 }, - { "73", 516000 }, - { "74", 522000 }, - { "75", 528000 }, - { "76", 534000 }, - { "77", 540000 }, - { "78", 546000 }, - { "79", 552000 }, - { "80", 558000 }, - { "81", 564000 }, - { "82", 570000 }, - { "83", 576000 }, - { "84", 582000 }, - { "85", 588000 }, - { "86", 594000 }, - { "87", 600000 }, - { "88", 606000 }, - { "89", 612000 }, - { "90", 618000 }, - { "91", 624000 }, - { "92", 630000 }, - { "93", 636000 }, - { "94", 642000 }, - { "95", 900000 }, - { "96", 960000 }, - { "97", 102000 }, - { "98", 108000 }, - { "99", 114000 }, - { "100", 648000 }, - { "101", 654000 }, - { "102", 660000 }, - { "103", 666000 }, - { "104", 672000 }, - { "105", 678000 }, - { "106", 684000 }, - { "107", 690000 }, - { "108", 696000 }, - { "109", 702000 }, - { "110", 708000 }, - { "111", 714000 }, - { "112", 720000 }, - { "113", 726000 }, - { "114", 732000 }, - { "115", 738000 }, - { "116", 744000 }, - { "117", 750000 }, - { "118", 756000 }, - { "119", 762000 }, - { "120", 768000 }, - { "121", 774000 }, - { "122", 780000 }, - { "123", 786000 }, - { "124", 792000 }, - { "125", 798000 }, - - { "T7", 7000 }, - { "T8", 13000 }, - { "T9", 19000 }, - { "T10", 25000 }, - { "T11", 31000 }, - { "T12", 37000 }, - { "T13", 43000 }, - { "T14", 49000 }, -}; - -/* --------------------------------------------------------------------- */ - -/* JP broadcast */ -static const struct CHANLIST ntsc_bcast_jp[] = { - { "1", 91250 }, - { "2", 97250 }, - { "3", 103250 }, - { "4", 171250 }, - { "5", 177250 }, - { "6", 183250 }, - { "7", 189250 }, - { "8", 193250 }, - { "9", 199250 }, - { "10", 205250 }, - { "11", 211250 }, - { "12", 217250 }, - - { "13", 471250 }, - { "14", 477250 }, - { "15", 483250 }, - { "16", 489250 }, - { "17", 495250 }, - { "18", 501250 }, - { "19", 507250 }, - { "20", 513250 }, - { "21", 519250 }, - { "22", 525250 }, - { "23", 531250 }, - { "24", 537250 }, - { "25", 543250 }, - { "26", 549250 }, - { "27", 555250 }, - { "28", 561250 }, - { "29", 567250 }, - { "30", 573250 }, - { "31", 579250 }, - { "32", 585250 }, - { "33", 591250 }, - { "34", 597250 }, - { "35", 603250 }, - { "36", 609250 }, - { "37", 615250 }, - { "38", 621250 }, - { "39", 627250 }, - { "40", 633250 }, - { "41", 639250 }, - { "42", 645250 }, - { "43", 651250 }, - { "44", 657250 }, - - { "45", 663250 }, - { "46", 669250 }, - { "47", 675250 }, - { "48", 681250 }, - { "49", 687250 }, - { "50", 693250 }, - { "51", 699250 }, - { "52", 705250 }, - { "53", 711250 }, - { "54", 717250 }, - { "55", 723250 }, - { "56", 729250 }, - { "57", 735250 }, - { "58", 741250 }, - { "59", 747250 }, - { "60", 753250 }, - { "61", 759250 }, - { "62", 765250 }, -}; - -/* JP cable */ -static const struct CHANLIST ntsc_cable_jp[] = { - { "13", 109250 }, - { "14", 115250 }, - { "15", 121250 }, - { "16", 127250 }, - { "17", 133250 }, - { "18", 139250 }, - { "19", 145250 }, - { "20", 151250 }, - - { "21", 157250 }, - { "22", 165250 }, - { "23", 223250 }, - { "24", 231250 }, - { "25", 237250 }, - { "26", 243250 }, - { "27", 249250 }, - { "28", 253250 }, - { "29", 259250 }, - { "30", 265250 }, - { "31", 271250 }, - { "32", 277250 }, - { "33", 283250 }, - { "34", 289250 }, - { "35", 295250 }, - { "36", 301250 }, - { "37", 307250 }, - { "38", 313250 }, - { "39", 319250 }, - { "40", 325250 }, - { "41", 331250 }, - { "42", 337250 }, - { "43", 343250 }, - { "44", 349250 }, - { "45", 355250 }, - { "46", 361250 }, - { "47", 367250 }, - { "48", 373250 }, - { "49", 379250 }, - { "50", 385250 }, - { "51", 391250 }, - { "52", 397250 }, - { "53", 403250 }, - { "54", 409250 }, - { "55", 415250 }, - { "56", 421250 }, - { "57", 427250 }, - { "58", 433250 }, - { "59", 439250 }, - { "60", 445250 }, - { "61", 451250 }, - { "62", 457250 }, - { "63", 463250 }, -}; - -/* --------------------------------------------------------------------- */ - -/* australia */ -static const struct CHANLIST pal_australia[] = { - { "0", 46250 }, - { "1", 57250 }, - { "2", 64250 }, - { "3", 86250 }, - { "4", 95250 }, - { "5", 102250 }, - { "5A", 138250 }, - { "6", 175250 }, - { "7", 182250 }, - { "8", 189250 }, - { "9", 196250 }, - { "10", 209250 }, - { "11", 216250 }, - { "28", 527250 }, - { "29", 534250 }, - { "30", 541250 }, - { "31", 548250 }, - { "32", 555250 }, - { "33", 562250 }, - { "34", 569250 }, - { "35", 576250 }, - { "36", 591250 }, - { "39", 604250 }, - { "40", 611250 }, - { "41", 618250 }, - { "42", 625250 }, - { "43", 632250 }, - { "44", 639250 }, - { "45", 646250 }, - { "46", 653250 }, - { "47", 660250 }, - { "48", 667250 }, - { "49", 674250 }, - { "50", 681250 }, - { "51", 688250 }, - { "52", 695250 }, - { "53", 702250 }, - { "54", 709250 }, - { "55", 716250 }, - { "56", 723250 }, - { "57", 730250 }, - { "58", 737250 }, - { "59", 744250 }, - { "60", 751250 }, - { "61", 758250 }, - { "62", 765250 }, - { "63", 772250 }, - { "64", 779250 }, - { "65", 786250 }, - { "66", 793250 }, - { "67", 800250 }, - { "68", 807250 }, - { "69", 814250 }, -}; - -/* --------------------------------------------------------------------- */ -/* europe */ - -/* CCIR frequencies */ - -#define FREQ_CCIR_I_III \ - { "E2", 48250 }, \ - { "E3", 55250 }, \ - { "E4", 62250 }, \ - \ - { "S01", 69250 }, \ - { "S02", 76250 }, \ - { "S03", 83250 }, \ - \ - { "E5", 175250 }, \ - { "E6", 182250 }, \ - { "E7", 189250 }, \ - { "E8", 196250 }, \ - { "E9", 203250 }, \ - { "E10", 210250 }, \ - { "E11", 217250 }, \ - { "E12", 224250 } - -#define FREQ_CCIR_SL_SH \ - { "SE1", 105250 }, \ - { "SE2", 112250 }, \ - { "SE3", 119250 }, \ - { "SE4", 126250 }, \ - { "SE5", 133250 }, \ - { "SE6", 140250 }, \ - { "SE7", 147250 }, \ - { "SE8", 154250 }, \ - { "SE9", 161250 }, \ - { "SE10", 168250 }, \ - \ - { "SE11", 231250 }, \ - { "SE12", 238250 }, \ - { "SE13", 245250 }, \ - { "SE14", 252250 }, \ - { "SE15", 259250 }, \ - { "SE16", 266250 }, \ - { "SE17", 273250 }, \ - { "SE18", 280250 }, \ - { "SE19", 287250 }, \ - { "SE20", 294250 } - -#define FREQ_CCIR_H \ - { "S21", 303250 }, \ - { "S22", 311250 }, \ - { "S23", 319250 }, \ - { "S24", 327250 }, \ - { "S25", 335250 }, \ - { "S26", 343250 }, \ - { "S27", 351250 }, \ - { "S28", 359250 }, \ - { "S29", 367250 }, \ - { "S30", 375250 }, \ - { "S31", 383250 }, \ - { "S32", 391250 }, \ - { "S33", 399250 }, \ - { "S34", 407250 }, \ - { "S35", 415250 }, \ - { "S36", 423250 }, \ - { "S37", 431250 }, \ - { "S38", 439250 }, \ - { "S39", 447250 }, \ - { "S40", 455250 }, \ - { "S41", 463250 } - -/* OIRT frequencies */ - -#define FREQ_OIRT_I_III \ - { "R1", 49750 }, \ - { "R2", 59250 }, \ - \ - { "R3", 77250 }, \ - { "R4", 85250 }, \ - { "R5", 93250 }, \ - \ - { "R6", 175250 }, \ - { "R7", 183250 }, \ - { "R8", 191250 }, \ - { "R9", 199250 }, \ - { "R10", 207250 }, \ - { "R11", 215250 }, \ - { "R12", 223250 } - -#define FREQ_OIRT_SL_SH \ - { "SR1", 111250 }, \ - { "SR2", 119250 }, \ - { "SR3", 127250 }, \ - { "SR4", 135250 }, \ - { "SR5", 143250 }, \ - { "SR6", 151250 }, \ - { "SR7", 159250 }, \ - { "SR8", 167250 }, \ - \ - { "SR11", 231250 }, \ - { "SR12", 239250 }, \ - { "SR13", 247250 }, \ - { "SR14", 255250 }, \ - { "SR15", 263250 }, \ - { "SR16", 271250 }, \ - { "SR17", 279250 }, \ - { "SR18", 287250 }, \ - { "SR19", 295250 } - -#define FREQ_UHF \ - { "21", 471250 }, \ - { "22", 479250 }, \ - { "23", 487250 }, \ - { "24", 495250 }, \ - { "25", 503250 }, \ - { "26", 511250 }, \ - { "27", 519250 }, \ - { "28", 527250 }, \ - { "29", 535250 }, \ - { "30", 543250 }, \ - { "31", 551250 }, \ - { "32", 559250 }, \ - { "33", 567250 }, \ - { "34", 575250 }, \ - { "35", 583250 }, \ - { "36", 591250 }, \ - { "37", 599250 }, \ - { "38", 607250 }, \ - { "39", 615250 }, \ - { "40", 623250 }, \ - { "41", 631250 }, \ - { "42", 639250 }, \ - { "43", 647250 }, \ - { "44", 655250 }, \ - { "45", 663250 }, \ - { "46", 671250 }, \ - { "47", 679250 }, \ - { "48", 687250 }, \ - { "49", 695250 }, \ - { "50", 703250 }, \ - { "51", 711250 }, \ - { "52", 719250 }, \ - { "53", 727250 }, \ - { "54", 735250 }, \ - { "55", 743250 }, \ - { "56", 751250 }, \ - { "57", 759250 }, \ - { "58", 767250 }, \ - { "59", 775250 }, \ - { "60", 783250 }, \ - { "61", 791250 }, \ - { "62", 799250 }, \ - { "63", 807250 }, \ - { "64", 815250 }, \ - { "65", 823250 }, \ - { "66", 831250 }, \ - { "67", 839250 }, \ - { "68", 847250 }, \ - { "69", 855250 } - -static const struct CHANLIST europe_west[] = { - FREQ_CCIR_I_III, - FREQ_CCIR_SL_SH, - FREQ_CCIR_H, - FREQ_UHF -}; - -static const struct CHANLIST europe_east[] = { - FREQ_OIRT_I_III, - FREQ_OIRT_SL_SH, - FREQ_CCIR_I_III, - FREQ_CCIR_SL_SH, - FREQ_CCIR_H, - FREQ_UHF -}; - -static const struct CHANLIST pal_italy[] = { - { "A", 53750 }, - { "B", 62250 }, - { "C", 82250 }, - { "D", 175250 }, - { "E", 183750 }, - { "F", 192250 }, - { "G", 201250 }, - { "H", 210250 }, - { "H1", 217250 }, - { "H2", 224250 }, - FREQ_UHF -}; - -static const struct CHANLIST pal_ireland[] = { - { "A0", 45750 }, - { "A1", 48000 }, - { "A2", 53750 }, - { "A3", 56000 }, - { "A4", 61750 }, - { "A5", 64000 }, - { "A6", 175250 }, - { "A7", 176000 }, - { "A8", 183250 }, - { "A9", 184000 }, - { "A10", 191250 }, - { "A11", 192000 }, - { "A12", 199250 }, - { "A13", 200000 }, - { "A14", 207250 }, - { "A15", 208000 }, - { "A16", 215250 }, - { "A17", 216000 }, - { "A18", 224000 }, - { "A19", 232000 }, - { "A20", 248000 }, - { "A21", 256000 }, - { "A22", 264000 }, - { "A23", 272000 }, - { "A24", 280000 }, - { "A25", 288000 }, - { "A26", 296000 }, - { "A27", 304000 }, - { "A28", 312000 }, - { "A29", 320000 }, - { "A30", 344000 }, - { "A31", 352000 }, - { "A32", 408000 }, - { "A33", 416000 }, - { "A34", 448000 }, - { "A35", 480000 }, - { "A36", 520000 }, - FREQ_UHF, -}; - -static const struct CHANLIST secam_france[] = { - { "K01", 47750 }, - { "K02", 55750 }, - { "K03", 60500 }, - { "K04", 63750 }, - { "K05", 176000 }, - { "K06", 184000 }, - { "K07", 192000 }, - { "K08", 200000 }, - { "K09", 208000 }, - { "K10", 216000 }, - { "KB", 116750 }, - { "KC", 128750 }, - { "KD", 140750 }, - { "KE", 159750 }, - { "KF", 164750 }, - { "KG", 176750 }, - { "KH", 188750 }, - { "KI", 200750 }, - { "KJ", 212750 }, - { "KK", 224750 }, - { "KL", 236750 }, - { "KM", 248750 }, - { "KN", 260750 }, - { "KO", 272750 }, - { "KP", 284750 }, - { "KQ", 296750 }, - { "H01", 303250 }, - { "H02", 311250 }, - { "H03", 319250 }, - { "H04", 327250 }, - { "H05", 335250 }, - { "H06", 343250 }, - { "H07", 351250 }, - { "H08", 359250 }, - { "H09", 367250 }, - { "H10", 375250 }, - { "H11", 383250 }, - { "H12", 391250 }, - { "H13", 399250 }, - { "H14", 407250 }, - { "H15", 415250 }, - { "H16", 423250 }, - { "H17", 431250 }, - { "H18", 439250 }, - { "H19", 447250 }, - FREQ_UHF, -}; - -/* --------------------------------------------------------------------- */ - -static const struct CHANLIST pal_newzealand[] = { - { "1", 45250 }, - { "2", 55250 }, - { "3", 62250 }, - { "4", 175250 }, - { "5", 182250 }, - { "6", 189250 }, - { "7", 196250 }, - { "8", 203250 }, - { "9", 210250 }, - { "10", 217250 }, - { "11", 224250 }, - FREQ_UHF, -}; - -/* --------------------------------------------------------------------- */ - -/* China broadcast */ -static const struct CHANLIST pal_bcast_cn[] = { - { "1", 49750 }, - { "2", 57750 }, - { "3", 65750 }, - { "4", 77250 }, - { "5", 85250 }, - { "6", 112250 }, - { "7", 120250 }, - { "8", 128250 }, - { "9", 136250 }, - { "10", 144250 }, - { "11", 152250 }, - { "12", 160250 }, - { "13", 168250 }, - { "14", 176250 }, - { "15", 184250 }, - { "16", 192250 }, - { "17", 200250 }, - { "18", 208250 }, - { "19", 216250 }, - { "20", 224250 }, - { "21", 232250 }, - { "22", 240250 }, - { "23", 248250 }, - { "24", 256250 }, - { "25", 264250 }, - { "26", 272250 }, - { "27", 280250 }, - { "28", 288250 }, - { "29", 296250 }, - { "30", 304250 }, - { "31", 312250 }, - { "32", 320250 }, - { "33", 328250 }, - { "34", 336250 }, - { "35", 344250 }, - { "36", 352250 }, - { "37", 360250 }, - { "38", 368250 }, - { "39", 376250 }, - { "40", 384250 }, - { "41", 392250 }, - { "42", 400250 }, - { "43", 408250 }, - { "44", 416250 }, - { "45", 424250 }, - { "46", 432250 }, - { "47", 440250 }, - { "48", 448250 }, - { "49", 456250 }, - { "50", 463250 }, - { "51", 471250 }, - { "52", 479250 }, - { "53", 487250 }, - { "54", 495250 }, - { "55", 503250 }, - { "56", 511250 }, - { "57", 519250 }, - { "58", 527250 }, - { "59", 535250 }, - { "60", 543250 }, - { "61", 551250 }, - { "62", 559250 }, - { "63", 607250 }, - { "64", 615250 }, - { "65", 623250 }, - { "66", 631250 }, - { "67", 639250 }, - { "68", 647250 }, - { "69", 655250 }, - { "70", 663250 }, - { "71", 671250 }, - { "72", 679250 }, - { "73", 687250 }, - { "74", 695250 }, - { "75", 703250 }, - { "76", 711250 }, - { "77", 719250 }, - { "78", 727250 }, - { "79", 735250 }, - { "80", 743250 }, - { "81", 751250 }, - { "82", 759250 }, - { "83", 767250 }, - { "84", 775250 }, - { "85", 783250 }, - { "86", 791250 }, - { "87", 799250 }, - { "88", 807250 }, - { "89", 815250 }, - { "90", 823250 }, - { "91", 831250 }, - { "92", 839250 }, - { "93", 847250 }, - { "94", 855250 }, -}; - -/* --------------------------------------------------------------------- */ -/* South Africa Broadcast */ - -static const struct CHANLIST pal_bcast_za[] ={ - { "1", 175250 }, - { "2", 183250 }, - { "3", 191250 }, - { "4", 199250 }, - { "5", 207250 }, - { "6", 215250 }, - { "7", 223250 }, - { "8", 231250 }, - FREQ_UHF -}; - -/* --------------------------------------------------------------------- */ - -static const struct CHANLIST argentina[] = { - { "001", 56250 }, - { "002", 62250 }, - { "003", 68250 }, - { "004", 78250 }, - { "005", 84250 }, - { "006", 176250 }, - { "007", 182250 }, - { "008", 188250 }, - { "009", 194250 }, - { "010", 200250 }, - { "011", 206250 }, - { "012", 212250 }, - { "013", 122250 }, - { "014", 128250 }, - { "015", 134250 }, - { "016", 140250 }, - { "017", 146250 }, - { "018", 152250 }, - { "019", 158250 }, - { "020", 164250 }, - { "021", 170250 }, - { "022", 218250 }, - { "023", 224250 }, - { "024", 230250 }, - { "025", 236250 }, - { "026", 242250 }, - { "027", 248250 }, - { "028", 254250 }, - { "029", 260250 }, - { "030", 266250 }, - { "031", 272250 }, - { "032", 278250 }, - { "033", 284250 }, - { "034", 290250 }, - { "035", 296250 }, - { "036", 302250 }, - { "037", 308250 }, - { "038", 314250 }, - { "039", 320250 }, - { "040", 326250 }, - { "041", 332250 }, - { "042", 338250 }, - { "043", 344250 }, - { "044", 350250 }, - { "045", 356250 }, - { "046", 362250 }, - { "047", 368250 }, - { "048", 374250 }, - { "049", 380250 }, - { "050", 386250 }, - { "051", 392250 }, - { "052", 398250 }, - { "053", 404250 }, - { "054", 410250 }, - { "055", 416250 }, - { "056", 422250 }, - { "057", 428250 }, - { "058", 434250 }, - { "059", 440250 }, - { "060", 446250 }, - { "061", 452250 }, - { "062", 458250 }, - { "063", 464250 }, - { "064", 470250 }, - { "065", 476250 }, - { "066", 482250 }, - { "067", 488250 }, - { "068", 494250 }, - { "069", 500250 }, - { "070", 506250 }, - { "071", 512250 }, - { "072", 518250 }, - { "073", 524250 }, - { "074", 530250 }, - { "075", 536250 }, - { "076", 542250 }, - { "077", 548250 }, - { "078", 554250 }, - { "079", 560250 }, - { "080", 566250 }, - { "081", 572250 }, - { "082", 578250 }, - { "083", 584250 }, - { "084", 590250 }, - { "085", 596250 }, - { "086", 602250 }, - { "087", 608250 }, - { "088", 614250 }, - { "089", 620250 }, - { "090", 626250 }, - { "091", 632250 }, - { "092", 638250 }, - { "093", 644250 }, -}; - -/* --------------------------------------------------------------------- */ - -static const struct CHANLIST russia[] = { - {"1", 49750 }, - {"2", 59250 }, - {"3", 77250 }, - {"4", 85250 }, - {"5", 93250 }, - {"SK1", 111250 }, - {"SK2", 119250 }, - {"SK3", 127250 }, - {"SK4", 135250 }, - {"SK5", 143250 }, - {"SK6", 151250 }, - {"SK7", 159250 }, - {"SK8", 167250 }, - {"6", 175250 }, - {"7", 183250 }, - {"8", 191250 }, - {"9", 199250 }, - {"10", 207250 }, - {"11", 215250 }, - {"12", 223250 }, - {"SK11", 231250 }, - {"SK12", 239250 }, - {"SK13", 247250 }, - {"SK14", 255250 }, - {"SK15", 263250 }, - {"SK16", 271250 }, - {"SK17", 279250 }, - {"SK18", 287250 }, - {"S19", 295250 }, - {"S20", 303250 }, - {"S21", 311250 }, - {"S22", 319250 }, - {"S23", 327250 }, - {"S24", 335250 }, - {"S25", 343250 }, - {"S26", 351250 }, - {"S27", 359250 }, - {"S28", 367250 }, - {"S29", 375250 }, - {"S30", 383250 }, - {"S31", 391250 }, - {"S32", 399250 }, - {"S33", 407250 }, - {"S34", 415250 }, - {"S35", 423250 }, - {"S36", 431250 }, - {"S37", 439250 }, - {"S38", 447250 }, - {"S39", 455250 }, - {"S40", 463250 }, - {"21", 471250 }, - {"22", 479250 }, - {"23", 487250 }, - {"24", 495250 }, - {"25", 503250 }, - {"26", 511250 }, - {"27", 519250 }, - {"28", 527250 }, - {"29", 535250 }, - {"30", 543250 }, - {"31", 551250 }, - {"32", 559250 }, - {"33", 567250 }, - {"34", 575250 }, - {"35", 583250 }, - {"36", 591250 }, - {"37", 599250 }, - {"38", 607250 }, - {"39", 615250 }, - {"40", 623250 }, - {"41", 631250 }, - {"42", 639250 }, - {"43", 647250 }, - {"44", 655250 }, - {"45", 663250 }, - {"46", 671250 }, - {"47", 679250 }, - {"48", 687250 }, - {"49", 695250 }, - {"50", 703250 }, - {"51", 711250 }, - {"52", 719250 }, - {"53", 727250 }, - {"54", 735250 }, - {"55", 743250 }, - {"56", 751250 }, - {"57", 759250 }, - {"58", 767250 }, - {"59", 775250 }, - {"60", 783250 }, - {"61", 791250 }, - {"62", 799250 }, - {"63", 807250 }, - {"64", 815250 }, - {"65", 523250 }, - {"66", 831250 }, - {"67", 839250 }, - {"68", 847250 }, - {"69", 855250 }, -}; -/* --------------------------------------------------------------------- */ - -const struct CHANLISTS chanlists[] = { - { "us-bcast", ntsc_bcast, CHAN_COUNT(ntsc_bcast) }, - { "us-cable", ntsc_cable, CHAN_COUNT(ntsc_cable) }, - { "us-cable-hrc", ntsc_hrc, CHAN_COUNT(ntsc_hrc) }, - { "japan-bcast", ntsc_bcast_jp, CHAN_COUNT(ntsc_bcast_jp) }, - { "japan-cable", ntsc_cable_jp, CHAN_COUNT(ntsc_cable_jp) }, - { "europe-west", europe_west, CHAN_COUNT(europe_west) }, - { "europe-east", europe_east, CHAN_COUNT(europe_east) }, - { "italy", pal_italy, CHAN_COUNT(pal_italy) }, - { "newzealand", pal_newzealand, CHAN_COUNT(pal_newzealand) }, - { "australia", pal_australia, CHAN_COUNT(pal_australia) }, - { "ireland", pal_ireland, CHAN_COUNT(pal_ireland) }, - { "france", secam_france, CHAN_COUNT(secam_france) }, - { "china-bcast", pal_bcast_cn, CHAN_COUNT(pal_bcast_cn) }, - { "southafrica", pal_bcast_za, CHAN_COUNT(pal_bcast_za) }, - { "argentina", argentina, CHAN_COUNT(argentina) }, - { "russia", russia, CHAN_COUNT(russia) }, - { NULL, NULL, 0 } /* EOF */ -}; - -const int chancount = CHAN_COUNT(europe_west); diff --git a/stream/frequencies.h b/stream/frequencies.h deleted file mode 100644 index e215d023b5..0000000000 --- a/stream/frequencies.h +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Worldwide channel/frequency list - * - * Nathan Laredo (laredo@broked.net) - * - * Frequencies are given in kHz - * - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with mpv. If not, see . - */ - -#ifndef MPLAYER_FREQUENCIES_H -#define MPLAYER_FREQUENCIES_H - -#define NTSC_AUDIO_CARRIER 4500 -#define PAL_AUDIO_CARRIER_I 6000 -#define PAL_AUDIO_CARRIER_BGHN 5500 -#define PAL_AUDIO_CARRIER_MN 4500 -#define PAL_AUDIO_CARRIER_D 6500 -#define SEACAM_AUDIO_DKK1L 6500 -#define SEACAM_AUDIO_BG 5500 -/* NICAM 728 32-kHz, 14-bit digital stereo audio is transmitted in 1ms frames - containing 8 bits frame sync, 5 bits control, 11 bits additional data, and - 704 bits audio data. The bit rate is reduced by transmitting only 10 bits - plus parity of each 14 bit sample, the largest sample in a frame determines - which 10 bits are transmitted. The parity bits for audio samples also - specify the scaling factor used for that channel during that frame. The - companeded audio data is interleaved to reduce the influence of dropouts - and the whole frame except for sync bits is scrambled for spectrum shaping. - Data is modulated using QPSK, at below following subcarrier freqs */ -#define NICAM728_PAL_BGH 5850 -#define NICAM728_PAL_I 6552 - -/* COMPREHENSIVE LIST OF FORMAT BY COUNTRY - (M) NTSC used in: - Antigua, Aruba, Bahamas, Barbados, Belize, Bermuda, Bolivia, Burma, - Canada, Chile, Colombia, Costa Rica, Cuba, Curacao, Dominican Republic, - Ecuador, El Salvador, Guam Guatemala, Honduras, Jamaica, Japan, - South Korea, Mexico, Montserrat, Myanmar, Nicaragua, Panama, Peru, - Philippines, Puerto Rico, St Christopher and Nevis, Samoa, Suriname, - Taiwan, Trinidad/Tobago, United States, Venezuela, Virgin Islands - (B) PAL used in: - Albania, Algeria, Australia, Austria, Bahrain, Bangladesh, Belgium, - Bosnia-Herzegovinia, Brunei Darussalam, Cambodia, Cameroon, Croatia, - Cyprus, Denmark, Egypt, Ethiopia, Equatorial Guinea, Finland, Germany, - Ghana, Gibraltar, Greenland, Iceland, India, Indonesia, Israel, Italy, - Jordan, Kenya, Kuwait, Liberia, Libya, Luxembourg, Malaysa, Maldives, - Malta, Nepal, Netherlands, New Zeland, Nigeria, Norway, Oman, Pakistan, - Papua New Guinea, Portugal, Qatar, Sao Tome and Principe, Saudi Arabia, - Seychelles, Sierra Leone, Singapore, Slovenia, Somali, Spain, - Sri Lanka, Sudan, Swaziland, Sweden, Switzeland, Syria, Thailand, - Tunisia, Turkey, Uganda, United Arab Emirates, Yemen - (N) PAL used in: (Combination N = 4.5MHz audio carrier, 3.58MHz burst) - Argentina (Combination N), Paraguay, Uruguay - (M) PAL (525/60, 3.57MHz burst) used in: - Brazil - (G) PAL used in: - Albania, Algeria, Austria, Bahrain, Bosnia/Herzegovinia, Cambodia, - Cameroon, Croatia, Cyprus, Denmark, Egypt, Ethiopia, Equatorial Guinea, - Finland, Germany, Gibraltar, Greenland, Iceland, Israel, Italy, Jordan, - Kenya, Kuwait, Liberia, Libya, Luxembourg, Malaysia, Monaco, - Mozambique, Netherlands, New Zealand, Norway, Oman, Pakistan, - Papa New Guinea, Portugal, Qatar, Romania, Sierra Leone, Singapore, - Slovenia, Somalia, Spain, Sri Lanka, Sudan, Swaziland, Sweeden, - Switzerland, Syria, Thailand, Tunisia, Turkey, United Arab Emirates, - Yemen, Zambia, Zimbabwe - (D) PAL used in: - China, North Korea, Romania, Czech Republic - (H) PAL used in: - Belgium - (I) PAL used in: - Angola, Botswana, Gambia, Guinea-Bissau, Hong Kong, Ireland, Lesotho, - Malawi, Nambia, Nigeria, South Africa, Tanzania, United Kingdom, - Zanzibar - (B) SECAM used in: - Djibouti, Greece, Iran, Iraq, Lebanon, Mali, Mauritania, Mauritus, - Morocco - (D) SECAM used in: - Afghanistan, Armenia, Azerbaijan, Belarus, Bulgaria, - Estonia, Georgia, Hungary, Zazakhstan, Lithuania, Mongolia, Moldova, - Russia, Slovak Republic, Ukraine, Vietnam - (G) SECAM used in: - Greecem Iran, Iraq, Mali, Mauritus, Morocco, Saudi Arabia - (K) SECAM used in: - Armenia, Azerbaijan, Bulgaria, Estonia, Georgia, - Hungary, Kazakhstan, Lithuania, Madagascar, Moldova, Poland, Russia, - Slovak Republic, Ukraine, Vietnam - (K1) SECAM used in: - Benin, Burkina Faso, Burundi, Chad, Cape Verde, Central African - Republic, Comoros, Congo, Gabon, Madagascar, Niger, Rwanda, Senegal, - Togo, Zaire - (L) SECAM used in: - France -*/ - -/* --------------------------------------------------------------------- */ - -struct CHANLIST { - char name[8]; - int freq; -}; - -struct CHANLISTS { - const char *name; - const struct CHANLIST *list; - int count; -}; - -#define CHAN_COUNT(x) (sizeof(x)/sizeof(struct CHANLIST)) - -/* --------------------------------------------------------------------- */ - -extern const struct CHANLISTS chanlists[]; -extern const int chancount; - -#include "config.h" -#if !HAVE_GPL -#error GPL only -#endif - -#endif /* MPLAYER_FREQUENCIES_H */ diff --git a/stream/stream.c b/stream/stream.c index fd2bd8c163..273ab06959 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -46,7 +46,6 @@ extern const stream_info_t stream_info_cdda; extern const stream_info_t stream_info_dvb; -extern const stream_info_t stream_info_tv; extern const stream_info_t stream_info_smb; extern const stream_info_t stream_info_null; extern const stream_info_t stream_info_memory; @@ -75,9 +74,6 @@ static const stream_info_t *const stream_list[] = { #if HAVE_DVBIN &stream_info_dvb, #endif -#if HAVE_TV - &stream_info_tv, -#endi