EventHorizonStudio/EHS
EventHorizonStudio/EHS
3
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 1 Releases 7 Wiki Activity

New Audio and EHC PR #13

Merged
Karutoh merged 3 commits from audio into main 2024-10-06 23:00:32 -07:00
Conversation 0 Commits 3 Files Changed 19 +96 -48
5 changed files with 96 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9b42ad6d74 - Show all commits

4
include/ehs/io/audio/Audio.h
View File

@ -81,10 +81,14 @@ namespace ehs
UInt_64 GetSampleCount() const; UInt_64 GetSampleCount() const;
UInt_8 GetFrameSize() const;
UInt_64 GetSize() const; UInt_64 GetSize() const;
float GetLength() const; float GetLength() const;
Byte* GetFrame(UInt_64 frameIndex) const;
Array<Byte> FrameAsMono(UInt_64 frameIndex) const; Array<Byte> FrameAsMono(UInt_64 frameIndex) const;
Array<Byte> FrameAsStereo(UInt_64 frameIndex) const; Array<Byte> FrameAsStereo(UInt_64 frameIndex) const;

4
include/ehs/io/audio/BaseAudioDevice.h
View File

@ -52,7 +52,9 @@ namespace ehs
virtual UInt_64 ReceiveStream(void *data, UInt_64 size); virtual UInt_64 ReceiveStream(void *data, UInt_64 size);
void BridgeStreams(UInt_64 bufferSize); void BridgeStreams(BaseAudioDevice *input, UInt_64 frameBufferSize);
void BridgeStreams(UInt_64 frameBufferSize);
AudioDeviceType GetType() const; AudioDeviceType GetType() const;

90
src/io/audio/Audio.cpp
View File

@ -290,6 +290,11 @@ namespace ehs
return channels * frames; return channels * frames;
} }
UInt_8 Audio::GetFrameSize() const
{
return byteDepth * channels;
}
UInt_64 Audio::GetSize() const UInt_64 Audio::GetSize() const
{ {
return byteDepth * channels * frames; return byteDepth * channels * frames;
@ -300,6 +305,11 @@ namespace ehs
return length; return length;
} }
Byte* Audio::GetFrame(UInt_64 frameIndex) const
{
return &data[frameIndex * GetFrameSize()];
}
Array<Byte> Audio::FrameAsMono(const UInt_64 frameIndex) const Array<Byte> Audio::FrameAsMono(const UInt_64 frameIndex) const
{ {
Array<Byte> result(byteDepth); Array<Byte> result(byteDepth);
@ -1743,161 +1753,161 @@ namespace ehs
void Audio::SInt_16_to_SInt_8(Byte* newData, Byte* newPeak) const void Audio::SInt_16_to_SInt_8(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
newData[a] = (Byte)((float)((SInt_16*)data)[a] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX); newData[a] = (Byte)((double)((SInt_16*)data)[a] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
*(SInt_8*)newPeak = (SInt_8)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_8_MAX); *(SInt_8*)newPeak = (SInt_8)((double)*(SInt_16*)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_8_MAX);
} }
void Audio::Float_to_SInt_8(Byte* newData, Byte* newPeak) const void Audio::Float_to_SInt_8(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_8*)newData)[a] = (SInt_8)(((float*)data)[a] * (float)EHS_SINT_8_MAX); ((SInt_8*)newData)[a] = (SInt_8)((double)((float*)data)[a] * (double)EHS_SINT_8_MAX);
*(SInt_8*)newPeak = (SInt_8)(*(float*)peak * (float)EHS_SINT_8_MAX); *(SInt_8*)newPeak = (SInt_8)((double)(*(float*)peak) * (double)EHS_SINT_8_MAX);
} }
void Audio::SInt_32_to_SInt_8(Byte* newData, Byte* newPeak) const void Audio::SInt_32_to_SInt_8(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
newData[a] = (Byte)((float)((SInt_32*)data)[a] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX); newData[a] = (Byte)((double)((SInt_32*)data)[a] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
*(SInt_8*)newPeak = (SInt_8)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_8_MAX); *(SInt_8*)newPeak = (SInt_8)((double)*(SInt_32*)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_8_MAX);
} }
void Audio::SInt_64_to_SInt_8(Byte* newData, Byte* newPeak) const void Audio::SInt_64_to_SInt_8(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
newData[a] = (Byte)((float)((SInt_64*)data)[a] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX); newData[a] = (Byte)((double)((SInt_64*)data)[a] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
*(SInt_8*)newPeak = (SInt_8)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_8_MAX); *(SInt_8*)newPeak = (SInt_8)((double)*(SInt_64*)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_8_MAX);
} }
void Audio::SInt_8_to_SInt_16(Byte* newData, Byte* newPeak) const void Audio::SInt_8_to_SInt_16(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_16*)newData)[a] = (SInt_16)((float)(SInt_8)data[a] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX); ((SInt_16*)newData)[a] = (SInt_16)((double)(SInt_8)data[a] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
*(SInt_16*)newPeak = (SInt_16)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_16_MAX); *(SInt_16*)newPeak = (SInt_16)((double)*(SInt_8*)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_16_MAX);
} }
void Audio::Float_to_SInt_16(Byte* newData, Byte* newPeak) const void Audio::Float_to_SInt_16(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_16*)newData)[a] = (SInt_16)(((float*)data)[a] * (float)EHS_SINT_16_MAX); ((SInt_16*)newData)[a] = (SInt_16)((double)((float*)data)[a] * (double)EHS_SINT_16_MAX);
*(SInt_16*)newPeak = (SInt_16)(*(float*)peak * (float)EHS_SINT_16_MAX); *(SInt_16*)newPeak = (SInt_16)((double)(*(float*)peak) * (double)EHS_SINT_16_MAX);
} }
void Audio::SInt_32_to_SInt_16(Byte* newData, Byte* newPeak) const void Audio::SInt_32_to_SInt_16(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_16*)newData)[a] = (SInt_16)((float)((SInt_32*)data)[a] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX); ((SInt_16*)newData)[a] = (SInt_16)((double)((SInt_32*)data)[a] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
*(SInt_16*)newPeak = (SInt_16)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_16_MAX); *(SInt_16*)newPeak = (SInt_16)((double)*(SInt_32*)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_16_MAX);
} }
void Audio::SInt_64_to_SInt_16(Byte* newData, Byte* newPeak) const void Audio::SInt_64_to_SInt_16(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_16*)newData)[a] = (SInt_16)((float)((SInt_64*)data)[a] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX); ((SInt_16*)newData)[a] = (SInt_16)((double)((SInt_64*)data)[a] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
*(SInt_16*)newPeak = (SInt_16)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_16_MAX); *(SInt_16*)newPeak = (SInt_16)((double)*(SInt_64*)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_16_MAX);
} }
void Audio::SInt_8_to_Float(Byte* newData, Byte* newPeak) const void Audio::SInt_8_to_Float(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((float*)newData)[a] = (float)(((SInt_8*)data)[a]) / (float)EHS_SINT_8_MAX; ((float*)newData)[a] = (float)((double)(((SInt_8*)data)[a]) / (double)EHS_SINT_8_MAX);
*(float*)newPeak = (float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX; *(float*)newPeak = (float)((double)*(SInt_8*)peak / (double)EHS_SINT_8_MAX);
} }
void Audio::SInt_16_to_Float(Byte* newData, Byte* newPeak) const void Audio::SInt_16_to_Float(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((float*)newData)[a] = (float)(((SInt_16*)data)[a]) / (float)EHS_SINT_16_MAX; ((float*)newData)[a] = (float)((double)(((SInt_16*)data)[a]) / (double)EHS_SINT_16_MAX);
*(float*)newPeak = (float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX; *(float*)newPeak = (float)((double)*(SInt_16*)peak / (double)EHS_SINT_16_MAX);
} }
void Audio::SInt_32_to_Float(Byte* newData, Byte* newPeak) const void Audio::SInt_32_to_Float(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((float*)newData)[a] = (float)(((SInt_32*)data)[a]) / (float)EHS_SINT_32_MAX; ((float*)newData)[a] = (float)((double)(((SInt_32*)data)[a]) / (double)EHS_SINT_32_MAX);
*(float*)newPeak = (float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX; *(float*)newPeak = (float)((double)*(SInt_32*)peak / (double)EHS_SINT_32_MAX);
} }
void Audio::SInt_64_to_Float(Byte* newData, Byte* newPeak) const void Audio::SInt_64_to_Float(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((float*)newData)[a] = (float)(((SInt_64*)data)[a]) / (float)EHS_SINT_64_MAX; ((float*)newData)[a] = (float)((double)(((SInt_64*)data)[a]) / (double)EHS_SINT_64_MAX);
*(float*)newPeak = (float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX; *(float*)newPeak = (float)((double)*(SInt_64*)peak / (double)EHS_SINT_64_MAX);
} }
void Audio::SInt_8_to_SInt_32(Byte* newData, Byte* newPeak) const void Audio::SInt_8_to_SInt_32(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_32*)newData)[a] = (SInt_32)((float)(SInt_8)data[a] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX); ((SInt_32*)newData)[a] = (SInt_32)((double)(SInt_8)data[a] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
*(SInt_32*)newPeak = (SInt_32)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_32_MAX); *(SInt_32*)newPeak = (SInt_32)((double)*(SInt_8*)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_32_MAX);
} }
void Audio::SInt_16_to_SInt_32(Byte* newData, Byte* newPeak) const void Audio::SInt_16_to_SInt_32(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_32*)newData)[a] = (SInt_32)((float)((SInt_16*)data)[a] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX); ((SInt_32*)newData)[a] = (SInt_32)((double)((SInt_16*)data)[a] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
*(SInt_32*)newPeak = (SInt_32)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_32_MAX); *(SInt_32*)newPeak = (SInt_32)((double)*(SInt_16*)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_32_MAX);
} }
void Audio::Float_to_SInt_32(Byte* newData, Byte* newPeak) const void Audio::Float_to_SInt_32(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_32*)newData)[a] = (SInt_32)(((float*)data)[a] * (float)EHS_SINT_32_MAX); ((SInt_32*)newData)[a] = (SInt_32)(((double*)data)[a] * (double)EHS_SINT_32_MAX);
*(SInt_32*)newPeak = (SInt_32)(*(float*)peak * (float)EHS_SINT_32_MAX); *(SInt_32*)newPeak = (SInt_32)(*(double*)peak * (double)EHS_SINT_32_MAX);
} }
void Audio::SInt_64_to_SInt_32(Byte* newData, Byte* newPeak) const void Audio::SInt_64_to_SInt_32(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_32*)newData)[a] = (SInt_32)((float)((SInt_64*)data)[a] / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX); ((SInt_32*)newData)[a] = (SInt_32)((double)((SInt_64*)data)[a] / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
*(SInt_32*)newPeak = (SInt_32)((float)*(SInt_64*)peak / (float)EHS_SINT_64_MAX * (float)EHS_SINT_32_MAX); *(SInt_32*)newPeak = (SInt_32)((double)*(SInt_64*)peak / (double)EHS_SINT_64_MAX * (double)EHS_SINT_32_MAX);
} }
void Audio::SInt_8_to_SInt_64(Byte* newData, Byte* newPeak) const void Audio::SInt_8_to_SInt_64(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_64*)newData)[a] = (SInt_64)((float)(SInt_8)data[a] / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX); ((SInt_64*)newData)[a] = (SInt_64)((double)(SInt_8)data[a] / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
*(SInt_64*)newPeak = (SInt_64)((float)*(SInt_8*)peak / (float)EHS_SINT_8_MAX * (float)EHS_SINT_64_MAX); *(SInt_64*)newPeak = (SInt_64)((double)*(SInt_8*)peak / (double)EHS_SINT_8_MAX * (double)EHS_SINT_64_MAX);
} }
void Audio::SInt_16_to_SInt_64(Byte* newData, Byte* newPeak) const void Audio::SInt_16_to_SInt_64(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_64*)newData)[a] = (SInt_64)((float)((SInt_16*)data)[a] / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX); ((SInt_64*)newData)[a] = (SInt_64)((double)((SInt_16*)data)[a] / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
*(SInt_64*)newPeak = (SInt_64)((float)*(SInt_16*)peak / (float)EHS_SINT_16_MAX * (float)EHS_SINT_64_MAX); *(SInt_64*)newPeak = (SInt_64)((double)*(SInt_16*)peak / (double)EHS_SINT_16_MAX * (double)EHS_SINT_64_MAX);
} }
void Audio::Float_to_SInt_64(Byte* newData, Byte* newPeak) const void Audio::Float_to_SInt_64(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_64*)newData)[a] = (SInt_64)(((float*)data)[a] * (float)EHS_SINT_64_MAX); ((SInt_64*)newData)[a] = (SInt_64)(((double*)data)[a] * (double)EHS_SINT_64_MAX);
*(SInt_64*)newPeak = (SInt_64)(*(float*)peak * (float)EHS_SINT_64_MAX); *(SInt_64*)newPeak = (SInt_64)(*(double*)peak * (double)EHS_SINT_64_MAX);
} }
void Audio::SInt_32_to_SInt_64(Byte* newData, Byte* newPeak) const void Audio::SInt_32_to_SInt_64(Byte* newData, Byte* newPeak) const
{ {
for (UInt_64 a = 0; a < GetSampleCount(); ++a) for (UInt_64 a = 0; a < GetSampleCount(); ++a)
((SInt_64*)newData)[a] = (SInt_64)((float)((SInt_32*)data)[a] / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX); ((SInt_64*)newData)[a] = (SInt_64)((double)((SInt_32*)data)[a] / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
*(SInt_64*)newPeak = (SInt_64)((float)*(SInt_32*)peak / (float)EHS_SINT_32_MAX * (float)EHS_SINT_64_MAX); *(SInt_64*)newPeak = (SInt_64)((double)*(SInt_32*)peak / (double)EHS_SINT_32_MAX * (double)EHS_SINT_64_MAX);
} }
bool EncodeEHA(const ehs::AudioCodec* const codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Audio* const in) bool EncodeEHA(const ehs::AudioCodec* const codec, ehs::Serializer<ehs::UInt_64>& out, const ehs::Audio* const in)

2
src/io/audio/AudioDevice_W32.cpp
View File

@ -341,6 +341,8 @@ namespace ehs
return 0; return 0;
} }
Util::Copy(buffer, data, frameSize * byteDepth * channels);
r = playbackClient->ReleaseBuffer(frameSize, 0); r = playbackClient->ReleaseBuffer(frameSize, 0);
if (r == AUDCLNT_E_DEVICE_INVALIDATED) if (r == AUDCLNT_E_DEVICE_INVALIDATED)
{ {

44
src/io/audio/BaseAudioDevice.cpp
View File

@ -1,4 +1,5 @@
#include "ehs/io/audio/BaseAudioDevice.h" #include "ehs/io/audio/BaseAudioDevice.h"
#include "ehs/log.h"
namespace ehs namespace ehs
{ {
@ -49,19 +50,48 @@ namespace ehs
return 0; return 0;
} }
void BaseAudioDevice::BridgeStreams(const UInt_64 bufferSize) void BaseAudioDevice::BridgeStreams(BaseAudioDevice* input, UInt_64 frameBufferSize)
{ {
Byte* buffer = new Byte[bufferSize]; if (type != AudioDeviceType::OUTPUT)
{
EHS_LOG_INT(LogType::WARN, 0, "The current audio device object is not an output device.");
return;
}
UInt_64 result = ReceiveStream(buffer, bufferSize); if (input->type != AudioDeviceType::INPUT)
while (result < bufferSize) {
result += ReceiveStream(&buffer[result], bufferSize - result); EHS_LOG_INT(LogType::WARN, 1, "The provided audio device is not an input device.");
return;
}
Byte* buffer = new Byte[frameBufferSize * GetFrameSize()];
UInt_64 result = 0;
while (result < frameBufferSize)
result += input->ReceiveStream(&buffer[result * GetFrameSize()], frameBufferSize - result);
result -= SendStream(buffer, result);
while (result) while (result)
result -= SendStream(&buffer[bufferSize - result], result); result -= SendStream(&buffer[(frameBufferSize - result) * GetFrameSize()], result);
delete[] buffer; delete[] buffer;
EHS_LOG_SUCCESS();
}
void BaseAudioDevice::BridgeStreams(const UInt_64 frameBufferSize)
{
Byte* buffer = new Byte[frameBufferSize * GetFrameSize()];
UInt_64 result = ReceiveStream(buffer, frameBufferSize);
while (result < frameBufferSize)
result += ReceiveStream(&buffer[result * GetFrameSize()], frameBufferSize - result);
while (result)
result -= SendStream(&buffer[(frameBufferSize - result) * GetFrameSize()], result);
delete[] buffer;
EHS_LOG_SUCCESS();
} }
AudioDeviceType BaseAudioDevice::GetType() const AudioDeviceType BaseAudioDevice::GetType() const