Commit 135f5ae1 authored by Juan Quintela's avatar Juan Quintela Committed by Gerd Hoffmann
Browse files

audio: GUSsample is int16_t 



Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Message-id: 20170425223739.6703-20-quintela@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 4bf7792a

hw/audio/gus.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ typedef struct GUSState { 
    uint32_t freq;

    uint32_t port;

    int pos, left, shift, irqs;

    GUSsample *mixbuf;

    int16_t *mixbuf;

    uint8_t himem[1024 * 1024 + 32 + 4096];

    int samples;

    SWVoiceOut *voice;

hw/audio/gusemu.h

+1 −11
Original line number Diff line number Diff line
@@ -25,16 +25,6 @@ 
#ifndef 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

{

 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 */

/* 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 */

/* lower values may result in increased rounding error, higher values often cause audible timing delays */

hw/audio/gusemu_hal.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#define GUSregb(position) (*            (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 */

unsigned int gus_read(GUSEmuState * state, int port, int size)

hw/audio/gusemu_mixer.c

+4 −4
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 


#define GUSregb(position)  (*            (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)))



/* 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,

                   GUSsample *bufferpos)

                   int16_t *bufferpos)

{

    /* note that byte registers are stored in the upper half of each voice register! */

    uint8_t        *gusptr;
@@ -171,8 +171,8 @@ void gus_mixvoices(GUSEmuState * state, unsigned int playback_freq, unsigned int 
                }



                /* mix samples into buffer */

                *(bufferpos + 2 * sample)     += (GUSsample) ((sample1 * PanningPos) >> 4);        /* right */

                *(bufferpos + 2 * sample + 1) += (GUSsample) ((sample1 * (15 - PanningPos)) >> 4); /* left */

                *(bufferpos + 2 * sample)     += (int16_t) ((sample1 * PanningPos) >> 4);        /* right */

                *(bufferpos + 2 * sample + 1) += (int16_t) ((sample1 * (15 - PanningPos)) >> 4); /* left */

            }

            /* write back voice and volume */

            GUSvoice(wVSRCurrVol)   = Volume32 / 32;