Skip to content

cli tools: fix frame size estimation when frame_length isn't provided #831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baranovmv wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

cli tools: fix frame size estimation when frame_length isn't provided #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/tools/roc_copy/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,12 @@ size_t compute_max_frame_size(const sndio::IoConfig& io_config) {
audio::ChanLayout_Surround, audio::ChanOrder_Smpte,
audio::ChanMask_Surround_7_1_4, 48000);

return spec.ns_2_samples_overall(io_config.frame_length) * sizeof(audio::sample_t);
core::nanoseconds_t len = io_config.frame_length;
if (len == 0) {
len = 10 * core::Millisecond;
}

return spec.ns_2_samples_overall(len) * sizeof(audio::sample_t);
}

bool parse_input_uri(const gengetopt_args_info& args, address::IoUri& input_uri) {
Expand Down
11 changes: 11 additions & 0 deletions src/tools/roc_send/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,17 @@ bool build_context_config(const gengetopt_args_info& args,
roc_log(LogError, "invalid --max-frame-size: should be > 0");
return false;
}
} else {
audio::SampleSpec spec = io_config.sample_spec;
spec.use_defaults(audio::Format_Pcm, audio::PcmSubformat_Raw,
audio::ChanLayout_Surround, audio::ChanOrder_Smpte,
audio::ChanMask_Surround_7_1_4, 48000);
core::nanoseconds_t len = io_config.frame_length;
if (len == 0) {
len = 10 * core::Millisecond;
}
context_config.max_frame_size =
spec.ns_2_samples_overall(len) * sizeof(audio::sample_t);
}

return true;
Expand Down
Loading