TV: Minor code cleanup

This commit is contained in:
Andreas Eversberg 2018-06-24 11:40:53 +02:00
parent 83449726f8
commit 7c4cfd5567
3 changed files with 8 additions and 6 deletions

View File

@ -69,13 +69,15 @@ static struct tv_channels {
{ 0, 0, 0, } { 0, 0, 0, }
}; };
double get_tv_video_frequency(int channel) double get_tv_frequency(int channel, double *audio_offset)
{ {
int i; int i;
for (i = 0; tv_channels[i].channel; i++) { for (i = 0; tv_channels[i].channel; i++) {
if (tv_channels[i].channel == channel) if (tv_channels[i].channel == channel) {
*audio_offset = (tv_channels[i].audio_mhz - tv_channels[i].video_mhz) * 1e6;
return tv_channels[i].video_mhz * 1e6; return tv_channels[i].video_mhz * 1e6;
}
} }
return 0.0; return 0.0;

View File

@ -1,4 +1,4 @@
double get_tv_video_frequency(int channel); double get_tv_frequency(int channel, double *audio_offset);
void list_tv_channels(void); void list_tv_channels(void);

View File

@ -53,7 +53,7 @@ int rt_prio = 1;
void *get_sender_by_empfangsfrequenz() { return NULL; } void *get_sender_by_empfangsfrequenz() { return NULL; }
static double __attribute__((__unused__)) modulation = 0.7; /* level of modulation for I/Q amplitudes */ static double __attribute__((__unused__)) modulation = 0.7; /* level of modulation for I/Q amplitudes */
static double frequency = 0.0; static double frequency = 0.0, audio_offset;
static int fbas = 1; static int fbas = 1;
static int tone = 1; static int tone = 1;
static double circle_radius = 6.7; static double circle_radius = 6.7;
@ -161,7 +161,7 @@ static int handle_options(int short_option, int argi, char **argv)
list_tv_channels(); list_tv_channels();
return 0; return 0;
} }
frequency = get_tv_video_frequency(atoi(argv[argi])); frequency = get_tv_frequency(atoi(argv[argi]), &audio_offset);
if (frequency == 0.0) { if (frequency == 0.0) {
fprintf(stderr, "Given channel number unknown, use \"-c list\" to get a list.\n"); fprintf(stderr, "Given channel number unknown, use \"-c list\" to get a list.\n");
return -EINVAL; return -EINVAL;
@ -275,7 +275,7 @@ static void tx_bas(sample_t *sample_bas, __attribute__((__unused__)) sample_t *s
if (sample_tone) { if (sample_tone) {
/* bandwidth is 2*(deviation + 2*f(sig)) = 2 * (50 + 2*15) = 160khz */ /* bandwidth is 2*(deviation + 2*f(sig)) = 2 * (50 + 2*15) = 160khz */
fm_mod_t mod; fm_mod_t mod;
fm_mod_init(&mod, samplerate, 5500000.0, modulation * 0.1); fm_mod_init(&mod, samplerate, audio_offset, modulation * 0.1);
mod.state = MOD_STATE_ON; /* do not ramp up */ mod.state = MOD_STATE_ON; /* do not ramp up */
fm_modulate_complex(&mod, sample_tone, power_tone, samples, buff); fm_modulate_complex(&mod, sample_tone, power_tone, samples, buff);
} }