libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-23 16:09:47 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Add audio_mixer.c for console/Apple builds

Browse Source
This commit is contained in:
twinaphex 2017-02-23 04:26:27 +01:00
parent c5b7a69801
commit cec74a9460
4 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.common
View File

@ -452,9 +452,9 @@ ifeq ($(HAVE_NEON),1)
endif
OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float.o \
$(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16.o \
$(LIBRETRO_COMM_DIR)/audio/audio_mix.o \
$(LIBRETRO_COMM_DIR)/formats/wav/rwav.o
$(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16.o \
$(LIBRETRO_COMM_DIR)/audio/audio_mix.o \
$(LIBRETRO_COMM_DIR)/formats/wav/rwav.o
ifeq ($(HAVE_NEON),1)
OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float_neon.o \

3
audio/audio_mixer.c
View File

@ -30,7 +30,6 @@
#define STB_VORBIS_NO_STDIO
#define STB_VORBIS_NO_CRT
#define assert( x )
#undef NULL
#ifdef __MINGW32__
@ -475,7 +474,9 @@ static void mix_ogg(float* buffer, size_t num_frames, audio_mixer_voice_t* voice
float volume = voice->volume;
struct resampler_data info = {0};
float* pcm = NULL;
#if 0
const audio_mixer_sound_t* sound = voice->sound;
#endif
if (voice->types.ogg.position == voice->types.ogg.samples)
{

48
deps/stb/stb_vorbis.h vendored
View File

@ -588,9 +588,9 @@ typedef signed int int32;
#endif
#ifdef STB_VORBIS_CODEBOOK_FLOATS
typedef float codetype;
typedef float stb_vorbis_codetype;
#else
typedef uint16 codetype;
typedef uint16 stb_vorbis_codetype;
#endif
// @NOTE
@ -620,7 +620,7 @@ typedef struct
uint8 sequence_p;
uint8 sparse;
uint32 lookup_values;
codetype *multiplicands;
stb_vorbis_codetype *multiplicands;
uint32 *codewords;
#ifdef STB_VORBIS_FAST_HUFFMAN_SHORT
int16 fast_huffman[FAST_HUFFMAN_TABLE_SIZE];
@ -926,7 +926,7 @@ static void setup_temp_free(vorb *f, void *p, int sz)
#define CRC32_POLY 0x04c11db7 // from spec
static uint32 crc_table[256];
static uint32 stb_vorbis_crc_table[256];
static void crc32_init(void)
{
int i,j;
@ -934,13 +934,13 @@ static void crc32_init(void)
for(i=0; i < 256; i++) {
for (s=i<<24, j=0; j < 8; ++j)
s = (s << 1) ^ (s >= (1U<<31) ? CRC32_POLY : 0);
crc_table[i] = s;
stb_vorbis_crc_table[i] = s;
}
}
static __forceinline uint32 crc32_update(uint32 crc, uint8 byte)
{
return (crc << 8) ^ crc_table[byte ^ (crc >> 24)];
return (crc << 8) ^ stb_vorbis_crc_table[byte ^ (crc >> 24)];
}
@ -3815,9 +3815,9 @@ static int start_decoder(vorb *f)
// pre-expand the lookup1-style multiplicands, to avoid a divide in the inner loop
if (sparse) {
if (c->sorted_entries == 0) goto skip;
c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->sorted_entries * c->dimensions);
c->multiplicands = (stb_vorbis_codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->sorted_entries * c->dimensions);
} else
c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->entries * c->dimensions);
c->multiplicands = (stb_vorbis_codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->entries * c->dimensions);
if (c->multiplicands == NULL) { setup_temp_free(f,mults,sizeof(mults[0])*c->lookup_values); return error(f, VORBIS_outofmem); }
len = sparse ? c->sorted_entries : c->entries;
for (j=0; j < len; ++j) {
@ -3844,7 +3844,7 @@ static int start_decoder(vorb *f)
else
#endif
{
c->multiplicands = (codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->lookup_values);
c->multiplicands = (stb_vorbis_codetype *) setup_malloc(f, sizeof(c->multiplicands[0]) * c->lookup_values);
#ifndef STB_VORBIS_CODEBOOK_FLOATS
memcpy(c->multiplicands, mults, sizeof(c->multiplicands[0]) * c->lookup_values);
#else
@ -5045,23 +5045,31 @@ stb_vorbis * stb_vorbis_open_memory(const unsigned char *data, int len, int *err
}
#ifndef STB_VORBIS_NO_INTEGER_CONVERSION
#ifndef PLAYBACK_MONO
#define PLAYBACK_MONO 1
#define PLAYBACK_LEFT 2
#define PLAYBACK_RIGHT 4
#endif
#define L (PLAYBACK_LEFT | PLAYBACK_MONO)
#define C (PLAYBACK_LEFT | PLAYBACK_RIGHT | PLAYBACK_MONO)
#define R (PLAYBACK_RIGHT | PLAYBACK_MONO)
#ifndef PLAYBACK_LEFT
#define PLAYBACK_LEFT 2
#endif
#ifndef PLAYBACK_RIGHT
#define PLAYBACK_RIGHT 4
#endif
#define STB_VORBIS_L (PLAYBACK_LEFT | PLAYBACK_MONO)
#define STB_VORBIS_C (PLAYBACK_LEFT | PLAYBACK_RIGHT | PLAYBACK_MONO)
#define STB_VORBIS_R (PLAYBACK_RIGHT | PLAYBACK_MONO)
static int8 channel_position[7][6] =
{
{ 0 },
{ C },
{ L, R },
{ L, C, R },
{ L, R, L, R },
{ L, C, R, L, R },
{ L, C, R, L, R, C },
{ STB_VORBIS_C },
{ STB_VORBIS_L, STB_VORBIS_R },
{ STB_VORBIS_L, STB_VORBIS_C, STB_VORBIS_R },
{ STB_VORBIS_L, STB_VORBIS_R, STB_VORBIS_L, STB_VORBIS_R },
{ STB_VORBIS_L, STB_VORBIS_C, STB_VORBIS_R, STB_VORBIS_L, STB_VORBIS_R },
{ STB_VORBIS_L, STB_VORBIS_C, STB_VORBIS_R, STB_VORBIS_L, STB_VORBIS_R, STB_VORBIS_C },
};

1
griffin/griffin.c
View File

@ -671,6 +671,7 @@ DRIVERS
#include "../gfx/video_coord_array.c"
#include "../input/input_driver.c"
#include "../audio/audio_driver.c"
#include "../audio/audio_mixer.c"
#include "../camera/camera_driver.c"
#include "../location/location_driver.c"
#include "../driver.c"