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.

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

aumix: add record sum handler #877

Merged
merged 3 commits into from
Jul 15, 2023
Merged

aumix: add record sum handler #877

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e25ce25
aumix: add record sum handler
sreimers Jul 12, 2023
42d40c8
fix wording
sreimers Jul 12, 2023
39d4640
fix wordings
sreimers Jul 14, 2023
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
1 change: 1 addition & 0 deletions include/rem_aumix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ typedef void (aumix_read_h)(struct auframe *af, void *arg);
int aumix_alloc(struct aumix **mixp, uint32_t srate,
uint8_t ch, uint32_t ptime);
void aumix_recordh(struct aumix *mix, aumix_record_h *recordh);
void aumix_record_sumh(struct aumix *mix, aumix_record_h *recordh);
int aumix_playfile(struct aumix *mix, const char *filepath);
uint32_t aumix_source_count(const struct aumix *mix);
int aumix_source_alloc(struct aumix_source **srcp, struct aumix *mix,
Expand Down
57 changes: 56 additions & 1 deletion rem/aumix/aumix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ struct aumix {
uint32_t srate;
uint8_t ch;
aumix_record_h *recordh;
aumix_record_h *record_sumh;
struct auframe rec_sum;
bool run;
};

Expand Down Expand Up @@ -202,6 +204,38 @@ static int aumix_thread(void *arg)
src->fh(mix_frame, mix->frame_size, src->arg);
}

if (mix->record_sumh) {
struct le *cle;

memcpy(mix_frame, base_frame, mix->frame_size * 2);

LIST_FOREACH(&mix->srcl, cle)
{
struct aumix_source *csrc = cle->data;
int32_t sample;

if (csrc->muted)
continue;

for (size_t i = 0; i < mix->frame_size; i++) {
sample = mix_frame[i] + csrc->frame[i];

/* soft clipping */
if (sample >= 32767)
sreimers marked this conversation as resolved.
Show resolved Hide resolved
sample = 32767;
if (sample <= -32767)
sample = -32767;

mix_frame[i] = (int16_t)sample;
}
}

mix->rec_sum.timestamp = now;
mix->rec_sum.sampv = mix_frame;

mix->record_sumh(&mix->rec_sum);
}

ts += mix->ptime;
}

Expand Down Expand Up @@ -245,6 +279,10 @@ int aumix_alloc(struct aumix **mixp, uint32_t srate,
mix->ch = ch;
mix->recordh = NULL;

mix->rec_sum.ch = ch;
mix->rec_sum.srate = srate;
mix->rec_sum.sampc = mix->frame_size;

err = mtx_init(&mix->mutex, mtx_plain) != thrd_success;
if (err) {
err = ENOMEM;
Expand Down Expand Up @@ -276,7 +314,7 @@ int aumix_alloc(struct aumix **mixp, uint32_t srate,


/**
* Add record handler
* Add multitrack record handler (each source can be identified by auframe->id)
*
* @param mix Audio mixer
* @param recordh Record Handler
Expand All @@ -292,6 +330,23 @@ void aumix_recordh(struct aumix *mix, aumix_record_h *recordh)
}


/**
* Add single track record handler
*
* @param mix Audio mixer
* @param recordh Record Handler
*/
void aumix_record_sumh(struct aumix *mix, aumix_record_h *recordh)
{
if (!mix)
return;

mtx_lock(&mix->mutex);
mix->record_sumh = recordh;
mtx_unlock(&mix->mutex);
}


/**
* Load audio file for mixer announcements
*
Expand Down