[FFmpeg-cvslog] [ffmpeg-radio] branch master updated. 11cd9eb1da avradio/sdrdemux: avoid repeated litteral number
ffmpeg-git at ffmpeg.org
ffmpeg-git at ffmpeg.org
Sat Jul 15 20:02:06 EEST 2023
The branch, master has been updated
via 11cd9eb1da798415bc96a6a72861a2c4dc0aabf8 (commit)
from d438006e10903a044d3429df5c24d5a3cd165fe8 (commit)
- Log -----------------------------------------------------------------
commit 11cd9eb1da798415bc96a6a72861a2c4dc0aabf8
Author: Michael Niedermayer <michael at niedermayer.cc>
AuthorDate: Thu Jul 13 23:01:19 2023 +0200
Commit: Michael Niedermayer <michael at niedermayer.cc>
CommitDate: Thu Jul 13 23:01:19 2023 +0200
avradio/sdrdemux: avoid repeated litteral number
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c
index d40b92dd24..041775730e 100644
--- a/libavradio/sdrdemux.c
+++ b/libavradio/sdrdemux.c
@@ -57,6 +57,8 @@
#include "libavutil/lfg.h"
#endif
+#define MAX_STATIONS 1000 // Maximum stations vissible at the same time
+
#define AM_FREQ_TOLERANCE 5
#define FM_FREQ_TOLERANCE 500
@@ -185,7 +187,7 @@ static int create_station(SDRContext *sdr, Station *candidate_station) {
int conflict = INT_MAX;
int nb_candidate_conflict = 0;
int nb_candidate_match = 0;
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
if (candidate_station->in_station_list)
@@ -287,7 +289,7 @@ static int create_station(SDRContext *sdr, Station *candidate_station) {
static void create_stations(SDRContext *sdr)
{
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
int nb_stations;
if (!sdr->block_center_freq)
@@ -330,7 +332,7 @@ static void *tree_remove(struct AVTreeNode **rootp, void *key,
*/
static void decay_stations(SDRContext *sdr)
{
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
int nb_stations = ff_sdr_find_stations(sdr, sdr->block_center_freq, sdr->bandwidth*0.5, station_list, FF_ARRAY_ELEMS(station_list));
for (int i=0; i<nb_stations; i++) {
@@ -381,7 +383,7 @@ static int create_candidate_station(SDRContext *sdr, enum Modulation modulation,
Station *station;
void *tmp;
struct AVTreeNode *next = NULL;
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
double snapdistance = modulation == AM ? AM_FREQ_TOLERANCE : FM_FREQ_TOLERANCE;
int nb_stations = ff_sdr_find_stations(sdr, freq, snapdistance, station_list, FF_ARRAY_ELEMS(station_list));
int update_freq = 1;
@@ -1274,7 +1276,7 @@ static int snap2station(SDRContext *sdr, int *seek_direction) {
double current_freq;
double best_distance = INT64_MAX;
Station *best_station = NULL;
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
int nb_stations = ff_sdr_find_stations(sdr, sdr->block_center_freq, sdr->sdr_sample_rate*0.5, station_list, FF_ARRAY_ELEMS(station_list));
if (sst->station) {
@@ -1740,7 +1742,7 @@ process_next_block:
}
if (sdr->demodulate_all_fm) {
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
int nb_stations = ff_sdr_find_stations(sdr, sdr->block_center_freq, sdr->sdr_sample_rate*0.5, station_list, FF_ARRAY_ELEMS(station_list));
for (int i= 0; i<nb_stations; i++) {
Station *station = station_list[i];
@@ -1900,7 +1902,7 @@ process_next_block:
// windowed_block is unused now, we can fill it with the next blocks data
if (sdr->block_center_freq) {
- Station *station_list[1000];
+ Station *station_list[MAX_STATIONS];
int nb_stations;
if (sdr->skip_probe-- <= 0) {
//Probing takes a bit of time, lets not do it every time
-----------------------------------------------------------------------
Summary of changes:
libavradio/sdrdemux.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
hooks/post-receive
--
More information about the ffmpeg-cvslog
mailing list