From: Michael Niedermayer <michael@niedermayer.cc> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: [FFmpeg-devel] [PATCH 2/6] avradio/sdr: Factor bug workaround detection code out. Date: Mon, 24 Jul 2023 20:35:31 +0200 Message-ID: <20230724183535.2677937-2-michael@niedermayer.cc> (raw) In-Reply-To: <20230724183535.2677937-1-michael@niedermayer.cc> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavradio/sdr.h | 5 +++++ libavradio/sdrdemux.c | 8 ++++++++ libavradio/sdrinradio.c | 5 +---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libavradio/sdr.h b/libavradio/sdr.h index de0a479d26..7d7bfd6806 100644 --- a/libavradio/sdr.h +++ b/libavradio/sdr.h @@ -290,6 +290,11 @@ extern const AVOption ff_sdr_options[]; extern ModulationDescriptor ff_sdr_modulation_descs[]; +/** + * Detect hw bug specific workarounds. + */ +void ff_sdr_autodetect_workarounds(SDRContext *sdr); + /** * Set the center frequency of the hardware * this will check the argument and call set_frequency_callback() diff --git a/libavradio/sdrdemux.c b/libavradio/sdrdemux.c index bb33c69668..b0b63827eb 100644 --- a/libavradio/sdrdemux.c +++ b/libavradio/sdrdemux.c @@ -99,6 +99,14 @@ static void apply_deemphasis(SDRContext *sdr, AVComplexFloat *data, int len, int } } +void ff_sdr_autodetect_workarounds(SDRContext *sdr) +{ + if (sdr->rtlsdr_fixes < 0) + sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr"); + if (sdr->sdrplay_fixes < 0) + sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay"); +} + static void free_station(Station *station) { if (station->stream) diff --git a/libavradio/sdrinradio.c b/libavradio/sdrinradio.c index 5c14250f8c..2865b6a9a6 100644 --- a/libavradio/sdrinradio.c +++ b/libavradio/sdrinradio.c @@ -212,10 +212,7 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s) if (!sdr->driver_name) return AVERROR(EINVAL); //No driver specified and none found - if (sdr->rtlsdr_fixes < 0) - sdr->rtlsdr_fixes = !strcmp(sdr->driver_name, "rtlsdr"); - if (sdr->sdrplay_fixes < 0) - sdr->sdrplay_fixes = !strcmp(sdr->driver_name, "sdrplay"); + ff_sdr_autodetect_workarounds(sdr); SoapySDRKwargs_set(&args, "driver", sdr->driver_name); sdr->soapy = soapy = SoapySDRDevice_make(&args); -- 2.31.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2023-07-24 18:35 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-07-24 18:35 [FFmpeg-devel] [PATCH 1/6] avradio/sdrinradio: Check tuner before applying rtlsdr frequency correction Michael Niedermayer 2023-07-24 18:35 ` Michael Niedermayer [this message] 2023-07-24 18:35 ` [FFmpeg-devel] [PATCH 3/6] avradio/sdrdemux: Call ff_sdr_autodetect_workarounds() from common init Michael Niedermayer 2023-07-24 18:35 ` [FFmpeg-devel] [PATCH 4/6] avradio/sdrdemux: Skiping detection of AM stations at DC point Michael Niedermayer 2023-07-24 18:35 ` [FFmpeg-devel] [PATCH 5/6] avradio/sdrinradio: apply R820T correction only for non direct mode Michael Niedermayer 2023-07-24 18:35 ` [FFmpeg-devel] [PATCH 6/6] avradio/sdr: Add am_multiple parameter to allow restricting detected AM stations Michael Niedermayer 2023-07-27 20:18 ` [FFmpeg-devel] [PATCH 1/6] avradio/sdrinradio: Check tuner before applying rtlsdr frequency correction Michael Niedermayer
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230724183535.2677937-2-michael@niedermayer.cc \ --to=michael@niedermayer.cc \ --cc=ffmpeg-devel@ffmpeg.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel This inbox may be cloned and mirrored by anyone: git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \ ffmpegdev@gitmailbox.com public-inbox-index ffmpegdev Example config snippet for mirrors. AGPL code for this site: git clone https://public-inbox.org/public-inbox.git