From: Peter Ross <pross@xvid.org>
To: ffmpeg-devel@ffmpeg.org
Subject: [FFmpeg-devel] [PATCH] avradio/avdevice/sdrindev: -sdr_ant option
Date: Thu, 21 Sep 2023 19:06:28 +1000
Message-ID: <e1bb1e569ada6b7297d9c4ae8a4b6f2a37fde28d.1695286903.git.pross@xvid.org> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 2370 bytes --]
Signed-off-by: Peter Ross <pross@xvid.org>
---
For use with uhd device with run-time selectable antenna jack.
libavdevice/sdrindev.c | 3 +++
libavformat/sdr.h | 1 +
libavformat/sdrdemux.c | 1 +
3 files changed, 5 insertions(+)
diff --git a/libavdevice/sdrindev.c b/libavdevice/sdrindev.c
index 8766fc2f34..337bc40c76 100644
--- a/libavdevice/sdrindev.c
+++ b/libavdevice/sdrindev.c
@@ -234,6 +234,9 @@ static int sdrindev_initial_hw_setup(AVFormatContext *s)
names = SoapySDRDevice_listAntennas(soapy, SOAPY_SDR_RX, 0, &length);
print_and_free_list(s, names, length, "Antennas");
+ if (sdr->sdr_ant)
+ SoapySDRDevice_setAntenna(soapy, SOAPY_SDR_RX, 0, sdr->sdr_ant);
+
//Go over all tunable elements
names = SoapySDRDevice_listFrequencies(soapy, SOAPY_SDR_RX, 0, &length);
print_and_free_list(s, names, length, "Tunables");
diff --git a/libavformat/sdr.h b/libavformat/sdr.h
index 1bf8fbef79..9cbb451418 100644
--- a/libavformat/sdr.h
+++ b/libavformat/sdr.h
@@ -153,6 +153,7 @@ typedef struct SDRContext {
int64_t max_freq;
int64_t min_center_freq;
int64_t max_center_freq;
+ char *sdr_ant;
int sdr_sample_rate;
float min_gain;
float max_gain;
diff --git a/libavformat/sdrdemux.c b/libavformat/sdrdemux.c
index 84dd90af80..882ae96751 100644
--- a/libavformat/sdrdemux.c
+++ b/libavformat/sdrdemux.c
@@ -2335,6 +2335,7 @@ const AVOption avpriv_sdr_options[] = {
{ "rtlsdr_fixes" , "workaround rtlsdr issues", OFFSET(rtlsdr_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
{ "sdrplay_fixes" , "workaround sdrplay issues", OFFSET(sdrplay_fixes), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
{ "dc_fix" , "Apply DC correction", OFFSET(dc_fix), AV_OPT_TYPE_INT , {.i64 = -1}, -1, 1, DEC},
+ { "sdr_ant", "sdr antenna", OFFSET(sdr_ant), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, DEC},
{ "sdr_sr" , "sdr sample rate" , OFFSET(sdr_sample_rate ), AV_OPT_TYPE_INT , {.i64 = 0}, 0, INT_MAX, DEC},
{ "sdr_freq", "sdr frequency" , OFFSET(user_wanted_freq), AV_OPT_TYPE_INT64 , {.i64 = 9000000}, 0, INT64_MAX, DEC},
{ "gain" , "sdr overall gain", OFFSET(sdr_gain), AV_OPT_TYPE_INT , {.i64 = GAIN_SDR_AGC}, -3, INT_MAX, DEC, "gain"},
--
2.40.1
-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
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 reply other threads:[~2023-09-21 9:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-21 9:06 Peter Ross [this message]
2023-09-22 17:06 ` 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=e1bb1e569ada6b7297d9c4ae8a4b6f2a37fde28d.1695286903.git.pross@xvid.org \
--to=pross@xvid.org \
--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