lili/ggwave
1
0
Fork 0
mirror of https://github.com/ggerganov/ggwave.git synced 2026-02-07 01:11:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

ggwave v0.2.0 (#20)

Browse Source 
* ggwave : add support for fixed length transmissions

* spectrogram : add sample rate offset for debugging purposes

* gwave : fix decoding bug

* waver : wip

* wip

* remove post-marker frames

* add resampler

* ggwave : input/output resampling

* ggwave : fix python build

* ggwave : update spm

* ggwave : refactor duplicate encode/decode code

* ggwave : fix sound marker detection

* waver : fix typo

* ggwave : fix uninitialized members

* ggwave : more sensitive receive
This commit is contained in:
Georgi Gerganov
2021-02-20 19:16:15 +02:00
committed by GitHub
parent ff5c569071
commit 19bf22df0d
17 changed files with 921 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
examples/waver/common.cpp
View File

@@ -188,6 +188,10 @@ struct State {
struct Input {
bool update = false;
Message message;
bool reinit = false;
bool isSampleRateOffset = false;
int payloadLength = -1;
};
struct Buffer {
@@ -509,6 +513,7 @@ void updateCore() {
static Input inputCurrent;
static int lastRxDataLength = 0;
static float lastRxTimestamp = 0.0f;
static GGWave::TxRxData lastRxData;
{
@@ -519,6 +524,15 @@ void updateCore() {
}
}
if (inputCurrent.reinit) {
GGWave_deinit();
// todo : use the provided cli arguments for playback and capture device
GGWave_init(0, 0, inputCurrent.payloadLength, inputCurrent.isSampleRateOffset ? -512 : 0);
g_ggWave = GGWave_instance();
inputCurrent.reinit = false;
}
if (inputCurrent.update) {
g_ggWave->init(
(int) inputCurrent.message.data.size(),
@@ -543,7 +557,7 @@ void updateCore() {
0,
Message::Error,
};
} else if (lastRxDataLength > 0) {
} else if (lastRxDataLength > 0 && ImGui::GetTime() - lastRxTimestamp > 0.5f) {
auto message = std::string((char *) lastRxData.data(), lastRxDataLength);
const Message::Type type = isFileBroadcastMessage(message) ? Message::FileBroadcast : Message::Text;
g_buffer.stateCore.update = true;
@@ -556,6 +570,7 @@ void updateCore() {
0,
type,
};
lastRxTimestamp = ImGui::GetTime();
}
if (g_ggWave->takeSpectrum(g_buffer.stateCore.spectrum)) {
@@ -663,6 +678,9 @@ void renderMain() {
struct Settings {
int protocolId = 1;
bool isFixedLength = false;
int payloadLength = 1;
bool isSampleRateOffset = false;
float volume = 0.10f;
};
@@ -817,14 +835,14 @@ void renderMain() {
ImGui::BeginChild("Settings:main", ImGui::GetContentRegionAvail(), true);
ImGui::Text("%s", "");
ImGui::Text("%s", "");
ImGui::Text("Waver v1.3.2");
ImGui::Text("Waver v1.4.0");
ImGui::Separator();
ImGui::Text("%s", "");
ImGui::Text("Sample rate (capture): %g, %d B/sample", g_ggWave->getSampleRateInp(), g_ggWave->getSampleSizeBytesInp());
ImGui::Text("Sample rate (playback): %g, %d B/sample", g_ggWave->getSampleRateOut(), g_ggWave->getSampleSizeBytesOut());
const float kLabelWidth = ImGui::CalcTextSize("Tx Protocol: ").x;
const float kLabelWidth = ImGui::CalcTextSize("Fixed-length: ").x;
// volume
ImGui::Text("%s", "");
@@ -879,6 +897,37 @@ void renderMain() {
ImGui::SetCursorScreenPos(posSave);
}
// fixed-length
ImGui::Text("%s", "");
{
auto posSave = ImGui::GetCursorScreenPos();
ImGui::Text("Fixed-length: ");
ImGui::SetCursorScreenPos({ posSave.x + kLabelWidth, posSave.y });
}
if (ImGui::Checkbox("##fixed-length", &settings.isFixedLength)) {
g_buffer.inputUI.update = true;
g_buffer.inputUI.reinit = true;
g_buffer.inputUI.isSampleRateOffset = settings.isSampleRateOffset;
g_buffer.inputUI.payloadLength = settings.isFixedLength ? settings.payloadLength : -1;
} else {
g_buffer.inputUI.reinit = false;
g_buffer.inputUI.isSampleRateOffset = false;
}
if (settings.isFixedLength) {
ImGui::SameLine();
ImGui::PushItemWidth(0.5*ImGui::GetContentRegionAvailWidth());
ImGui::SliderInt("Bytes", &settings.payloadLength, 1, 16);
ImGui::PopItemWidth();
ImGui::SameLine();
if (ImGui::Checkbox("Offset", &settings.isSampleRateOffset)) {
g_buffer.inputUI.update = true;
g_buffer.inputUI.reinit = true;
g_buffer.inputUI.isSampleRateOffset = settings.isSampleRateOffset;
g_buffer.inputUI.payloadLength = settings.isFixedLength ? settings.payloadLength : -1;
}
}
// protocol
ImGui::Text("%s", "");
{
@@ -887,6 +936,12 @@ void renderMain() {
ImGui::SetCursorScreenPos({ posSave.x + kLabelWidth, posSave.y });
ImGui::TextDisabled("[U] = ultrasound");
}
{
auto posSave = ImGui::GetCursorScreenPos();
ImGui::Text("%s", "");
ImGui::SetCursorScreenPos({ posSave.x + kLabelWidth, posSave.y });
ImGui::TextDisabled("[DT] = dual-tone");
}
{
auto posSave = ImGui::GetCursorScreenPos();
ImGui::Text("Tx Protocol: ");
@@ -980,7 +1035,7 @@ void renderMain() {
{
auto col = ImVec4 { 1.0f, 0.0f, 0.0f, 1.0f };
col.w = interp;
ImGui::TextColored(col, "Failed to received");
ImGui::TextColored(col, "Failed to receive");
}
break;
case Message::Text: