From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 81E0346FBE for ; Mon, 24 Jul 2023 18:35:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A6BBB68C799; Mon, 24 Jul 2023 21:35:45 +0300 (EEST) Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [217.70.183.199]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D975A68C792 for ; Mon, 24 Jul 2023 21:35:38 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 2C5A5FF804 for ; Mon, 24 Jul 2023 18:35:37 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 24 Jul 2023 20:35:31 +0200 Message-Id: <20230724183535.2677937-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20230724183535.2677937-1-michael@niedermayer.cc> References: <20230724183535.2677937-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/6] avradio/sdr: Factor bug workaround detection code out. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Michael Niedermayer --- 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".