Skip to content

wasapi: Mix output when channel counts differ #856

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

Merged
kinetiknz merged 2 commits into from
Aug 15, 2026
Merged

wasapi: Mix output when channel counts differ #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a7ab74
wasapi: Mix output when channel counts differ
kinetiknz Aug 11, 2026
2bbb674
cubeb: Reject inconsistent channel layouts
kinetiknz Aug 11, 2026
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
11 changes: 9 additions & 2 deletions src/cubeb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#undef NDEBUG
#include "cubeb/cubeb.h"
#include "cubeb-internal.h"
#include "cubeb_mixer.h"
#include <assert.h>
#include <stddef.h>
#include <stdlib.h>
Expand Down Expand Up @@ -97,15 +98,21 @@ validate_stream_params(cubeb_stream_params * input_stream_params,
if (output_stream_params->rate < 1000 ||
output_stream_params->rate > 768000 ||
output_stream_params->channels < 1 ||
output_stream_params->channels > UINT8_MAX) {
output_stream_params->channels > UINT8_MAX ||
(output_stream_params->layout != CUBEB_LAYOUT_UNDEFINED &&
cubeb_channel_layout_nb_channels(output_stream_params->layout) !=
output_stream_params->channels)) {
return CUBEB_ERROR_INVALID_FORMAT;
}
}
if (input_stream_params) {
if (input_stream_params->rate < 1000 ||
input_stream_params->rate > 768000 ||
input_stream_params->channels < 1 ||
input_stream_params->channels > UINT8_MAX) {
input_stream_params->channels > UINT8_MAX ||
(input_stream_params->layout != CUBEB_LAYOUT_UNDEFINED &&
cubeb_channel_layout_nb_channels(input_stream_params->layout) !=
input_stream_params->channels)) {
return CUBEB_ERROR_INVALID_FORMAT;
}
}
Expand Down
3 changes: 2 additions & 1 deletion src/cubeb_wasapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2838,7 +2838,8 @@ setup_wasapi_stream(cubeb_stream * stm)

// Create output mixer.
if (has_output(stm) &&
stm->output_mix_params.layout != stm->output_stream_params.layout) {
(stm->output_mix_params.layout != stm->output_stream_params.layout ||
stm->output_mix_params.channels != stm->output_stream_params.channels)) {
if (stm->output_mix_params.layout == CUBEB_LAYOUT_UNDEFINED) {
LOG("Output stream using undefined layout! Any mixing may be "
"unpredictable!\n");
Expand Down
23 changes: 23 additions & 0 deletions test/test_sanity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,29 @@ TEST(cubeb, configure_stream_undefined_layout)
cubeb_destroy(ctx);
}

TEST(cubeb, reject_inconsistent_channel_layout)
{
cubeb * ctx;
cubeb_stream * stream;
cubeb_stream_params params = {};

int r = common_init(&ctx, "test_sanity");
ASSERT_EQ(r, CUBEB_OK);
ASSERT_NE(ctx, nullptr);

params.format = CUBEB_SAMPLE_FLOAT32NE;
params.rate = STREAM_RATE;
params.channels = UINT8_MAX;
params.layout = CUBEB_LAYOUT_STEREO;

r = cubeb_stream_init(ctx, &stream, "test", NULL, NULL, NULL, &params,
STREAM_LATENCY, test_data_callback, test_state_callback,
&dummy);
EXPECT_EQ(r, CUBEB_ERROR_INVALID_FORMAT);

cubeb_destroy(ctx);
}

static void
test_init_start_stop_destroy_multiple_streams(int early, int delay_ms)
{
Expand Down
Loading