Signed-off-by: Peter Ross --- 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)