scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 01:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor audio codec fmt parse

Browse Source 
Should be almost functional equivalent as the previous version.
This commit is contained in:
Martin Pulec
2023-11-29 09:53:24 +01:00
parent 042a854209
commit 288b2c5804
5 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.cpp
View File

@@ -1350,7 +1350,10 @@ int main(int argc, char *argv[])
col() << TBOLD("Audio playback : ") << opt.audio.recv_cfg << "\n";
col() << TBOLD("MTU : ") << opt.requested_mtu << " B\n";
col() << TBOLD("Video compression: ") << opt.requested_compression << "\n";
col() << TBOLD("Audio codec : ") << get_name_to_audio_codec(get_audio_codec(opt.audio.codec_cfg)) << "\n";
col() << TBOLD("Audio codec : ")
<< get_name_to_audio_codec(
parse_audio_codec_params(opt.audio.codec_cfg).codec)
<< "\n";
col() << TBOLD("Network protocol : ") << video_rxtx::get_long_name(opt.video_protocol) << "\n";
col() << TBOLD("Audio FEC : ") << opt.audio.fec_cfg << "\n";
col() << TBOLD("Video FEC : ") << opt.requested_video_fec << "\n";
@@ -1472,8 +1475,10 @@ int main(int argc, char *argv[])
params["opts"].str = opt.video_protocol_opts;
// RTSP
params["audio_codec"].l = get_audio_codec(opt.audio.codec_cfg);
params["audio_sample_rate"].i = get_audio_codec_sample_rate(opt.audio.codec_cfg) ? get_audio_codec_sample_rate(opt.audio.codec_cfg) : 48000;
auto ac_params = parse_audio_codec_params(opt.audio.codec_cfg);
params["audio_codec"].l = ac_params.codec;
params["audio_sample_rate"].i =
IF_NOT_NULL_ELSE(ac_params.sample_rate, kHz48);
params["audio_channels"].i = audio_capture_channels;
params["audio_bps"].i = 2;
params["a_rx_port"].i = opt.audio.recv_port;