OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

audio: GUSsample is int16_t

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-20-quintela@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Juan Quintela 2017-04-26 00:37:32 +02:00 committed by Gerd Hoffmann
parent 4bf7792aae
commit 135f5ae197
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/audio/gus.c
View File

@ -53,7 +53,7 @@ typedef struct GUSState {
uint32_t freq; uint32_t freq;
uint32_t port; uint32_t port;
int pos, left, shift, irqs; int pos, left, shift, irqs;
GUSsample *mixbuf; int16_t *mixbuf;
uint8_t himem[1024 * 1024 + 32 + 4096]; uint8_t himem[1024 * 1024 + 32 + 4096];
int samples; int samples;
SWVoiceOut *voice; SWVoiceOut *voice;

12
hw/audio/gusemu.h
View File

@ -25,16 +25,6 @@
#ifndef GUSEMU_H #ifndef GUSEMU_H
#define GUSEMU_H #define GUSEMU_H
/* data types (need to be adjusted if neither a VC6 nor a C99 compatible compiler is used) */
#if defined _WIN32 && defined _MSC_VER /* doesn't support other win32 compilers yet, do it yourself... */
typedef unsigned int GUSdword;
typedef signed short GUSsample;
#else
typedef uint32_t GUSdword;
typedef int16_t GUSsample;
#endif
typedef struct _GUSEmuState typedef struct _GUSEmuState
{ {
uint8_t *himemaddr; /* 1024*1024 bytes used for storing uploaded samples (+32 additional bytes for read padding) */ uint8_t *himemaddr; /* 1024*1024 bytes used for storing uploaded samples (+32 additional bytes for read padding) */
@ -86,7 +76,7 @@ void gus_dma_transferdata(GUSEmuState *state, char *dma_addr, unsigned int count
/* If the interrupts are asynchronous, it may be needed to use a separate thread mixing into a temporary */ /* If the interrupts are asynchronous, it may be needed to use a separate thread mixing into a temporary */
/* audio buffer in order to avoid quality loss caused by large numsamples and elapsed_time values. */ /* audio buffer in order to avoid quality loss caused by large numsamples and elapsed_time values. */
void gus_mixvoices(GUSEmuState *state, unsigned int playback_freq, unsigned int numsamples, GUSsample *bufferpos); void gus_mixvoices(GUSEmuState *state, unsigned int playback_freq, unsigned int numsamples, int16_t *bufferpos);
/* recommended range: 10 < numsamples < 100 */ /* recommended range: 10 < numsamples < 100 */
/* lower values may result in increased rounding error, higher values often cause audible timing delays */ /* lower values may result in increased rounding error, higher values often cause audible timing delays */

2
hw/audio/gusemu_hal.c
View File

@ -32,7 +32,7 @@
#define GUSregb(position) (* (gusptr+(position))) #define GUSregb(position) (* (gusptr+(position)))
#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position)))
#define GUSregd(position) (*(GUSdword *)(gusptr+(position))) #define GUSregd(position) (*(uint16_t *)(gusptr+(position)))
/* size given in bytes */ /* size given in bytes */
unsigned int gus_read(GUSEmuState * state, int port, int size) unsigned int gus_read(GUSEmuState * state, int port, int size)

8
hw/audio/gusemu_mixer.c
View File

@ -28,13 +28,13 @@
#define GUSregb(position) (* (gusptr+(position))) #define GUSregb(position) (* (gusptr+(position)))
#define GUSregw(position) (*(uint16_t *) (gusptr+(position))) #define GUSregw(position) (*(uint16_t *) (gusptr+(position)))
#define GUSregd(position) (*(GUSdword *)(gusptr+(position))) #define GUSregd(position) (*(uint16_t *)(gusptr+(position)))
#define GUSvoice(position) (*(uint16_t *)(voiceptr+(position))) #define GUSvoice(position) (*(uint16_t *)(voiceptr+(position)))
/* samples are always 16bit stereo (4 bytes each, first right then left interleaved) */ /* samples are always 16bit stereo (4 bytes each, first right then left interleaved) */
void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int numsamples, void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int numsamples,
GUSsample *bufferpos) int16_t *bufferpos)
{ {
/* note that byte registers are stored in the upper half of each voice register! */ /* note that byte registers are stored in the upper half of each voice register! */
uint8_t *gusptr; uint8_t *gusptr;
@ -171,8 +171,8 @@ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int
} }
/* mix samples into buffer */ /* mix samples into buffer */
*(bufferpos + 2 * sample) += (GUSsample) ((sample1 * PanningPos) >> 4); /* right */ *(bufferpos + 2 * sample) += (int16_t) ((sample1 * PanningPos) >> 4); /* right */
*(bufferpos + 2 * sample + 1) += (GUSsample) ((sample1 * (15 - PanningPos)) >> 4); /* left */ *(bufferpos + 2 * sample + 1) += (int16_t) ((sample1 * (15 - PanningPos)) >> 4); /* left */
} }
/* write back voice and volume */ /* write back voice and volume */
GUSvoice(wVSRCurrVol) = Volume32 / 32; GUSvoice(wVSRCurrVol) = Volume32 / 32;