zhangyuqing
/
ESP8266Audio
mirror of https://github.com/earlephilhower/ESP8266Audio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add flip channels and isolate channel to mixer

This commit is contained in:
ChuckMash 2023-12-19 18:10:29 -08:00 committed by GitHub
parent 0abcf71012
commit 1612022831
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/AudioOutputMixer.cpp
View File

@ -1,7 +1,7 @@
/*
AudioOutputMixer
Simple mixer which can combine multiple inputs to a single output stream
Copyright (C) 2018 Earle F. Philhower, III
This program is free software: you can redistribute it and/or modify
@ -48,6 +48,27 @@ bool AudioOutputMixerStub::SetChannels(int channels)
return parent->SetChannels(channels, id);
}
bool AudioOutputMixerStub::FlipChannels()
{
this->channelsFlipped = !this->channelsFlipped;
return true;
}
bool AudioOutputMixerStub::FlipChannels(bool flipped)
{
this->channelsFlipped = flipped;
return true;
}
bool AudioOutputMixerStub::IsolateChannel(uint8_t channel)
{
if(channel < 0 || channel > 2){
return false;
}
this->channelIsolated = channel;
return true;
}
bool AudioOutputMixerStub::begin()
{
return parent->begin(id);
@ -56,8 +77,10 @@ bool AudioOutputMixerStub::begin()
bool AudioOutputMixerStub::ConsumeSample(int16_t sample[2])
{
int16_t amp[2];
amp[LEFTCHANNEL] = Amplify(sample[LEFTCHANNEL]);
amp[RIGHTCHANNEL] = Amplify(sample[RIGHTCHANNEL]);
amp[this->channelsFlipped ? RIGHTCHANNEL:LEFTCHANNEL] = (this->channelIsolated == 2) ? 0 : Amplify(sample[this->channelsFlipped ? RIGHTCHANNEL : LEFTCHANNEL]);
amp[this->channelsFlipped ? LEFTCHANNEL:RIGHTCHANNEL] = (this->channelIsolated == 1) ? 0 : Amplify(sample[this->channelsFlipped ? LEFTCHANNEL : RIGHTCHANNEL]);
return parent->ConsumeSample(amp, id);
}
@ -156,7 +179,7 @@ bool AudioOutputMixer::begin(int id)
return true;
}
}
AudioOutputMixerStub *AudioOutputMixer::NewInput()
{
for (int i=0; i<maxStubs; i++) {

7
src/AudioOutputMixer.h
View File

@ -1,7 +1,7 @@
/*
AudioOutputMixer
Simple mixer which can combine multiple inputs to a single output stream
Copyright (C) 2017 Earle F. Philhower, III
This program is free software: you can redistribute it and/or modify
@ -35,6 +35,9 @@ class AudioOutputMixerStub : public AudioOutput
virtual bool SetRate(int hz) override;
virtual bool SetBitsPerSample(int bits) override;
virtual bool SetChannels(int channels) override;
virtual bool FlipChannels(); // Invert current state of channelsFlipped
virtual bool FlipChannels(bool flip); // Set channelsFlipped true/false
virtual bool IsolateChannel(uint8_t channel); // Isolate channel 0 both, 1 left, 2 right
virtual bool begin() override;
virtual bool ConsumeSample(int16_t sample[2]) override;
virtual bool stop() override;
@ -42,6 +45,8 @@ class AudioOutputMixerStub : public AudioOutput
protected:
AudioOutputMixer *parent;
int id;
bool channelsFlipped = false;
uint8_t channelIsolated = 0;
};
// Single mixer object per output