Skip to content
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.

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

audio_merge: Make audio channel mismatch message verbose #631

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/upipe-modules/upipe_audio_merge.c
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ static void upipe_audio_merge_produce_output(struct upipe *upipe, struct upump *
uint8_t output_channels = 0;
UBASE_ERROR(upipe, uref_sound_flow_get_channels(upipe_audio_merge->flow_def, &output_channels));
if (input_channels != output_channels)
upipe_err_va(upipe, "total input channels (%"PRIu64") != output flow def (%d), some will be skipped or blanked!",
upipe_verbose_va(upipe, "total input channels (%"PRIu64") != output flow def (%d), some will be skipped or blanked!",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't you think it would be better to print it once in set_flow_def ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually the check is wrong to begin with, I think the intention is to make sure the sum(uref_channels) = sum(flow_def_channels)

input_channels, output_channels);

uint64_t output_num_samples = 0;
Expand Down