radio95/fm95
0
1
Fork 0
mirror of https://github.com/radio95-rnt/fm95.git synced 2026-02-26 19:23:51 +01:00
Code Issues Activity

something here and there

Browse Source
This commit is contained in:
KubaPro010
2025-08-03 15:58:43 +02:00
parent 122677ef1e
commit de8f4652a4
9 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.vscode/.server-controller-port.log vendored
View File

@@ -1,5 +1,5 @@
{ {
"port": 13452, "port": 13452,
"time": 1754151185891, "time": 1754228131242,
"version": "0.0.3" "version": "0.0.3"
} }

3
.vscode/settings.json vendored
View File

@@ -42,7 +42,8 @@
"queue": "c", "queue": "c",
"thread": "c", "thread": "c",
"vector": "c", "vector": "c",
"stereo_encoder.h": "c" "stereo_encoder.h": "c",
"iir.h": "c"
}, },
"C_Cpp.errorSquiggles": "disabled" "C_Cpp.errorSquiggles": "disabled"
} }

2
filter/bs412.c
View File

@@ -36,7 +36,7 @@ float bs412_compress(BS412Compressor* mpx, float sample) {
#ifdef BS412_DEBUG #ifdef BS412_DEBUG
if(mpx->average_counter % mpx->sample_rate == 0) { if(mpx->average_counter % mpx->sample_rate == 0) {
debug_printf("MPX power: %.2f dBr (%.0f)\n", modulation_power, avg_deviation); debug_printf("MPX power: %.2f dBr (%.0f) with gain %.2fx\n", modulation_power, avg_deviation, mpx->gain);
} }
#endif #endif

24
io/audio.c
View File

@@ -7,6 +7,8 @@ int init_PulseInputDevice(PulseInputDevice* dev, const int sample_rate, const in
if (dev->initialized) return PA_ERR_BADSTATE; if (dev->initialized) return PA_ERR_BADSTATE;
pa_sample_spec sample_spec = {.format = format, .channels = channels, .rate = sample_rate}; pa_sample_spec sample_spec = {.format = format, .channels = channels, .rate = sample_rate};
if (!pa_sample_spec_valid(&sample_spec)) return PA_ERR_INVALID;
pa_buffer_attr new_buffer_attr = *buffer_attr; pa_buffer_attr new_buffer_attr = *buffer_attr;
dev->sample_spec = sample_spec; dev->sample_spec = sample_spec;
dev->buffer_attr = new_buffer_attr; dev->buffer_attr = new_buffer_attr;
@@ -15,6 +17,8 @@ int init_PulseInputDevice(PulseInputDevice* dev, const int sample_rate, const in
dev->stream_name = strdup(stream_name); dev->stream_name = strdup(stream_name);
dev->device = strdup(device); dev->device = strdup(device);
dev->direction = 1;
int error; int error;
dev->dev = pa_simple_new(NULL, app_name, PA_STREAM_RECORD, device, stream_name, &sample_spec, NULL, &new_buffer_attr, &error); dev->dev = pa_simple_new(NULL, app_name, PA_STREAM_RECORD, device, stream_name, &sample_spec, NULL, &new_buffer_attr, &error);
if (!dev->dev) return error; if (!dev->dev) return error;
@@ -29,11 +33,12 @@ int read_PulseInputDevice(PulseInputDevice* dev, void* buffer, size_t size) {
return error; return error;
} }
void free_PulseInputDevice(PulseInputDevice* dev) { void free_PulseDevice(PulseDevice* dev) {
#ifdef PULSE_DEBUG #ifdef PULSE_DEBUG
debug_printf("Freeing PulseInputDevice with app_name: %s, stream_name: %s, device: %s\n", dev->app_name, dev->stream_name, dev->device); debug_printf("Freeing PulseDevice with app_name: %s, stream_name: %s, device: %s, direction: %d\n", dev->app_name, dev->stream_name, dev->device, dev->direction);
#endif #endif
if (!dev->direction) pa_simple_drain(dev->dev, NULL);
if (dev->dev && dev->initialized) pa_simple_free(dev->dev); if (dev->dev && dev->initialized) pa_simple_free(dev->dev);
free(dev->app_name); free(dev->app_name);
free(dev->stream_name); free(dev->stream_name);
@@ -41,6 +46,7 @@ void free_PulseInputDevice(PulseInputDevice* dev) {
dev->initialized = 0; dev->initialized = 0;
} }
int init_PulseOutputDevice(PulseOutputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format) { int init_PulseOutputDevice(PulseOutputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format) {
#ifdef PULSE_DEBUG #ifdef PULSE_DEBUG
debug_printf("Initializing PulseOutputDevice format with app_name: %s, stream_name: %s, device: %s, sample_rate: %d, channels: %d, format: %d\n", app_name, stream_name, device, sample_rate, channels, format); debug_printf("Initializing PulseOutputDevice format with app_name: %s, stream_name: %s, device: %s, sample_rate: %d, channels: %d, format: %d\n", app_name, stream_name, device, sample_rate, channels, format);
@@ -56,6 +62,8 @@ int init_PulseOutputDevice(PulseOutputDevice* dev, const int sample_rate, const
dev->stream_name = strdup(stream_name); dev->stream_name = strdup(stream_name);
dev->device = strdup(device); dev->device = strdup(device);
dev->direction = 0;
int error; int error;
dev->dev = pa_simple_new(NULL, app_name, PA_STREAM_PLAYBACK, device, stream_name, &sample_spec, NULL, &new_buffer_attr, &error); dev->dev = pa_simple_new(NULL, app_name, PA_STREAM_PLAYBACK, device, stream_name, &sample_spec, NULL, &new_buffer_attr, &error);
if (!dev->dev) return error; if (!dev->dev) return error;
@@ -69,15 +77,3 @@ int write_PulseOutputDevice(PulseOutputDevice* dev, void* buffer, size_t size) {
if(pa_simple_write(dev->dev, buffer, size, &error) == 0) return 0; if(pa_simple_write(dev->dev, buffer, size, &error) == 0) return 0;
return error; return error;
} }
void free_PulseOutputDevice(PulseOutputDevice* dev) {
#ifdef PULSE_DEBUG
debug_printf("Freeing PulseOutputDevice with app_name: %s, stream_name: %s, device: %s\n", dev->app_name, dev->stream_name, dev->device);
#endif
if (dev->dev && dev->initialized) pa_simple_free(dev->dev);
free(dev->app_name);
free(dev->stream_name);
free(dev->device);
dev->initialized = 0;
}

7
io/audio.h
View File

@@ -4,6 +4,7 @@
#include <pulse/error.h> #include <pulse/error.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdbool.h>
#ifdef DEBUG #ifdef DEBUG
#define PULSE_DEBUG #define PULSE_DEBUG
@@ -20,15 +21,15 @@ typedef struct
char* app_name; char* app_name;
char* stream_name; char* stream_name;
char* device; char* device;
sig_atomic_t initialized; bool initialized;
bool direction; // 0 = output, 1 - input
} PulseDevice; } PulseDevice;
typedef PulseDevice PulseInputDevice; typedef PulseDevice PulseInputDevice;
int init_PulseInputDevice(PulseInputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format); int init_PulseInputDevice(PulseInputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format);
int read_PulseInputDevice(PulseInputDevice *dev, void *buffer, size_t size); int read_PulseInputDevice(PulseInputDevice *dev, void *buffer, size_t size);
void free_PulseInputDevice(PulseInputDevice *dev); void free_PulseDevice(PulseDevice *dev);
typedef PulseDevice PulseOutputDevice; typedef PulseDevice PulseOutputDevice;
int init_PulseOutputDevice(PulseOutputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format); int init_PulseOutputDevice(PulseOutputDevice* dev, const int sample_rate, const int channels, const char* app_name, const char *stream_name, const char* device, pa_buffer_attr* buffer_attr, enum pa_sample_format format);
int write_PulseOutputDevice(PulseOutputDevice *dev, void *buffer, size_t size); int write_PulseOutputDevice(PulseOutputDevice *dev, void *buffer, size_t size);
void free_PulseOutputDevice(PulseOutputDevice *dev);

2
src/chimer95.c
View File

@@ -311,6 +311,6 @@ int main(int argc, char **argv) {
int ret = run_chimer95(config, &runtime); int ret = run_chimer95(config, &runtime);
printf("Cleaning up...\n"); printf("Cleaning up...\n");
free_PulseOutputDevice(&runtime.output_device); free_PulseDevice(&runtime.output_device);
return ret; return ret;
} }

23
src/fm95.c
View File

@@ -7,7 +7,6 @@
#define buffer_maxlength 12288 #define buffer_maxlength 12288
#define buffer_tlength_fragsize 12288 #define buffer_tlength_fragsize 12288
#define buffer_prebuf 8
#include "../dsp/oscillator.h" #include "../dsp/oscillator.h"
#include "../filter/iir.h" #include "../filter/iir.h"
@@ -129,13 +128,13 @@ void cleanup_runtime(FM95_Runtime* runtime, FM95_Config config) {
} }
void cleanup_audio_runtime(FM95_Runtime *rt, bool mpx_on, bool rds_on) { void cleanup_audio_runtime(FM95_Runtime *rt, bool mpx_on, bool rds_on) {
free_PulseInputDevice(&rt->input_device); free_PulseDevice(&rt->input_device);
if (mpx_on) free_PulseInputDevice(&rt->mpx_device); if (mpx_on) free_PulseDevice(&rt->mpx_device);
if (rds_on) { if (rds_on) {
free_PulseInputDevice(&rt->rds_device); free_PulseDevice(&rt->rds_device);
free(rt->rds_in); free(rt->rds_in);
} }
free_PulseOutputDevice(&rt->output_device); free_PulseDevice(&rt->output_device);
} }
int run_fm95(const FM95_Config config, FM95_Runtime* runtime) { int run_fm95(const FM95_Config config, FM95_Runtime* runtime) {
@@ -379,7 +378,7 @@ int setup_audio(FM95_Runtime* runtime, const FM95_DeviceNames dv_names, const FM
pa_buffer_attr output_buffer_atr = { pa_buffer_attr output_buffer_atr = {
.maxlength = buffer_maxlength, .maxlength = buffer_maxlength,
.tlength = buffer_tlength_fragsize, .tlength = buffer_tlength_fragsize,
.prebuf = buffer_prebuf .prebuf = 16
}; };
int opentime_pulse_error; int opentime_pulse_error;
@@ -397,7 +396,7 @@ int setup_audio(FM95_Runtime* runtime, const FM95_DeviceNames dv_names, const FM
opentime_pulse_error = init_PulseInputDevice(&runtime->mpx_device, config.sample_rate, 1, "fm95", "MPX Input", dv_names.mpx, &input_buffer_atr, PA_SAMPLE_FLOAT32NE); opentime_pulse_error = init_PulseInputDevice(&runtime->mpx_device, config.sample_rate, 1, "fm95", "MPX Input", dv_names.mpx, &input_buffer_atr, PA_SAMPLE_FLOAT32NE);
if (opentime_pulse_error) { if (opentime_pulse_error) {
fprintf(stderr, "Error: cannot open MPX device: %s\n", pa_strerror(opentime_pulse_error)); fprintf(stderr, "Error: cannot open MPX device: %s\n", pa_strerror(opentime_pulse_error));
free_PulseInputDevice(&runtime->input_device); free_PulseDevice(&runtime->input_device);
return 1; return 1;
} }
} }
@@ -407,8 +406,8 @@ int setup_audio(FM95_Runtime* runtime, const FM95_DeviceNames dv_names, const FM
opentime_pulse_error = init_PulseInputDevice(&runtime->rds_device, config.sample_rate, config.rds_streams, "fm95", "RDS95 Input", dv_names.rds, &input_buffer_atr, PA_SAMPLE_FLOAT32NE); opentime_pulse_error = init_PulseInputDevice(&runtime->rds_device, config.sample_rate, config.rds_streams, "fm95", "RDS95 Input", dv_names.rds, &input_buffer_atr, PA_SAMPLE_FLOAT32NE);
if (opentime_pulse_error) { if (opentime_pulse_error) {
fprintf(stderr, "Error: cannot open RDS device: %s\n", pa_strerror(opentime_pulse_error)); fprintf(stderr, "Error: cannot open RDS device: %s\n", pa_strerror(opentime_pulse_error));
free_PulseInputDevice(&runtime->input_device); free_PulseDevice(&runtime->input_device);
if(mpx_on) free_PulseInputDevice(&runtime->mpx_device); if(mpx_on) free_PulseDevice(&runtime->mpx_device);
return 1; return 1;
} }
runtime->rds_in = malloc(sizeof(float) * BUFFER_SIZE * config.rds_streams); runtime->rds_in = malloc(sizeof(float) * BUFFER_SIZE * config.rds_streams);
@@ -419,9 +418,9 @@ int setup_audio(FM95_Runtime* runtime, const FM95_DeviceNames dv_names, const FM
opentime_pulse_error = init_PulseOutputDevice(&runtime->output_device, config.sample_rate, 1, "fm95", "Main Audio Output", dv_names.output, &output_buffer_atr, PA_SAMPLE_FLOAT32NE); opentime_pulse_error = init_PulseOutputDevice(&runtime->output_device, config.sample_rate, 1, "fm95", "Main Audio Output", dv_names.output, &output_buffer_atr, PA_SAMPLE_FLOAT32NE);
if (opentime_pulse_error) { if (opentime_pulse_error) {
fprintf(stderr, "Error: cannot open output device: %s\n", pa_strerror(opentime_pulse_error)); fprintf(stderr, "Error: cannot open output device: %s\n", pa_strerror(opentime_pulse_error));
free_PulseInputDevice(&runtime->input_device); free_PulseDevice(&runtime->input_device);
if(mpx_on) free_PulseInputDevice(&runtime->mpx_device); if(mpx_on) free_PulseDevice(&runtime->mpx_device);
if(rds_on) free_PulseInputDevice(&runtime->rds_device); if(rds_on) free_PulseDevice(&runtime->rds_device);
return 1; return 1;
} }
return 0; return 0;

6
src/sca95.c
View File

@@ -187,7 +187,7 @@ int main(int argc, char **argv) {
opentime_pulse_error = init_PulseOutputDevice(&runtime.output, config.sample_rate, 1, "sca95", "Signal Output", audio_output_device, &output_buffer_atr, PA_SAMPLE_FLOAT32NE); opentime_pulse_error = init_PulseOutputDevice(&runtime.output, config.sample_rate, 1, "sca95", "Signal Output", audio_output_device, &output_buffer_atr, PA_SAMPLE_FLOAT32NE);
if (opentime_pulse_error) { if (opentime_pulse_error) {
fprintf(stderr, "Error: cannot open output device: %s\n", pa_strerror(opentime_pulse_error)); fprintf(stderr, "Error: cannot open output device: %s\n", pa_strerror(opentime_pulse_error));
free_PulseInputDevice(&runtime.input); free_PulseDevice(&runtime.input);
return 1; return 1;
} }
@@ -196,7 +196,7 @@ int main(int argc, char **argv) {
int ret = run_sca95(config, &runtime); int ret = run_sca95(config, &runtime);
printf("Cleaning up...\n"); printf("Cleaning up...\n");
free_PulseInputDevice(&runtime.input); free_PulseDevice(&runtime.input);
free_PulseOutputDevice(&runtime.output); free_PulseDevice(&runtime.output);
return ret; return ret;
} }

4
src/vban95.c
View File

@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) {
continue; continue;
} }
if (output.initialized) free_PulseOutputDevice(&output); if (output.initialized) free_PulseDevice(&output);
int result = init_PulseOutputDevice( int result = init_PulseOutputDevice(
&output, &output,
@@ -410,7 +410,7 @@ int main(int argc, char *argv[]) {
// Clean up // Clean up
printf("Cleaning up...\n"); printf("Cleaning up...\n");
if (output.initialized) free_PulseOutputDevice(&output); if (output.initialized) free_PulseDevice(&output);
destroy_audio_buffer(audio_buffer); destroy_audio_buffer(audio_buffer);
close(sockfd); close(sockfd);