lpnf/lovr
1
0
Fork 0
mirror of https://github.com/bjornbytes/lovr.git synced 2024-07-02 12:33:52 +00:00
Code Issues Projects Releases Wiki Activity

Sound:get/setFrames respects channel count;

Browse source
This commit is contained in:
bjorn 2021-04-03 10:01:37 -06:00
parent 024498b964
commit 15975343ea
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/api/l_data_sound.c
View file

@ -129,13 +129,13 @@ static int l_lovrSoundGetFrames(lua_State* L) {
short* shorts = (short*) buffer; short* shorts = (short*) buffer;
for (uint32_t i = 0; i < samples; i++) { for (uint32_t i = 0; i < samples; i++) {
lua_pushnumber(L, *shorts++); lua_pushnumber(L, *shorts++);
lua_rawseti(L, index, dstOffset + frames + i); lua_rawseti(L, index, dstOffset + (frames * channels) + i);
} }
} else { } else {
float* floats = (float*) buffer; float* floats = (float*) buffer;
for (uint32_t i = 0; i < samples; i++) { for (uint32_t i = 0; i < samples; i++) {
lua_pushnumber(L, *floats++); lua_pushnumber(L, *floats++);
lua_rawseti(L, index, dstOffset + frames + i); lua_rawseti(L, index, dstOffset + (frames * channels) + i);
} }
} }
@ -208,7 +208,7 @@ static int l_lovrSoundSetFrames(lua_State* L) {
int length = luax_len(L, 2); int length = luax_len(L, 2);
uint32_t srcOffset = luaL_optinteger(L, 5, 1); uint32_t srcOffset = luaL_optinteger(L, 5, 1);
uint32_t dstOffset = luaL_optinteger(L, 4, 0); uint32_t dstOffset = luaL_optinteger(L, 4, 0);
uint32_t limit = MIN(frameCount - dstOffset, length - srcOffset + 1); uint32_t limit = MIN(frameCount - dstOffset, (length - srcOffset) / channels + 1);
uint32_t count = luaL_optinteger(L, 3, limit); uint32_t count = luaL_optinteger(L, 3, limit);
lovrAssert(count <= limit, "Tried to write too many frames"); lovrAssert(count <= limit, "Tried to write too many frames");
@ -221,14 +221,14 @@ static int l_lovrSoundSetFrames(lua_State* L) {
if (format == SAMPLE_I16) { if (format == SAMPLE_I16) {
short* shorts = (short*) buffer; short* shorts = (short*) buffer;
for (uint32_t i = 0; i < samples; i++) { for (uint32_t i = 0; i < samples; i++) {
lua_rawgeti(L, 2, srcOffset + frames + i); lua_rawgeti(L, 2, srcOffset + (frames * channels) + i);
*shorts++ = lua_tointeger(L, -1); *shorts++ = lua_tointeger(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
} }
} else if (format == SAMPLE_F32) { } else if (format == SAMPLE_F32) {
float* floats = (float*) buffer; float* floats = (float*) buffer;
for (uint32_t i = 0; i < samples; i++) { for (uint32_t i = 0; i < samples; i++) {
lua_rawgeti(L, 2, srcOffset + frames + i); lua_rawgeti(L, 2, srcOffset + (frames * channels) + i);
*floats++ = lua_tonumber(L, -1); *floats++ = lua_tonumber(L, -1);
lua_pop(L, 1); lua_pop(L, 1);
} }