angel/mice-3ds
1
0
Fork 0
Code Issues Pull Requests Actions Releases 3 Activity

Change define to const in opus

Browse Source 
Signed-off-by: Mahyar Koshkouei <deltabeard@users.noreply.github.com>
This commit is contained in:
Mahyar Koshkouei
2017-01-09 19:59:44 +00:00
parent 644e501d6e
commit cdf964f5b1
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/opus.c
View File

@@ -5,10 +5,9 @@
#include "all.h" #include "all.h"
#include "opus.h" #include "opus.h"
#define SAMPLES_TO_READ (32 * 1024)
static OggOpusFile* opusFile; static OggOpusFile* opusFile;
static const OpusHead* opusHead; static const OpusHead* opusHead;
static const int buffSize = 32 * 1024;
/** /**
* Set decoder parameters for Opus. * Set decoder parameters for Opus.
@@ -21,7 +20,7 @@ void setOpus(struct decoder_fn* decoder)
decoder->rate = rateOpus; decoder->rate = rateOpus;
/* Opus decoder always returns stereo stream */ /* Opus decoder always returns stereo stream */
decoder->channels = 2; decoder->channels = 2;
decoder->buffSize = SAMPLES_TO_READ; decoder->buffSize = buffSize;
decoder->decode = decodeOpus; decoder->decode = decodeOpus;
decoder->exit = exitOpus; decoder->exit = exitOpus;
} }
@@ -66,7 +65,7 @@ uint32_t rateOpus(void)
*/ */
uint64_t decodeOpus(void* buffer) uint64_t decodeOpus(void* buffer)
{ {
return fillOpusBuffer(opusFile, SAMPLES_TO_READ, buffer); return fillOpusBuffer(opusFile, buffer);
} }
/** /**
@@ -81,15 +80,13 @@ void exitOpus(void)
* Decode Opus file to fill buffer. * Decode Opus file to fill buffer.
* *
* \param opusFile File to decode. * \param opusFile File to decode.
* \param samplesToRead Number of samples to read in to buffer. Must not exceed
* size of buffer.
* \param bufferOut Pointer to buffer. * \param bufferOut Pointer to buffer.
* \return Samples read per channel. * \return Samples read per channel.
*/ */
uint64_t fillOpusBuffer(OggOpusFile* opusFile, uint64_t samplesToRead, uint64_t fillOpusBuffer(OggOpusFile* opusFile, int16_t* bufferOut)
int16_t* bufferOut)
{ {
uint64_t samplesRead = 0; uint64_t samplesRead = 0;
int samplesToRead = buffSize;
while(samplesToRead > 0) while(samplesToRead > 0)
{ {

3
source/opus.h
View File

@@ -12,7 +12,6 @@ void exitOpus(void);
int playOpus(const char* in); int playOpus(const char* in);
uint64_t fillOpusBuffer(OggOpusFile* opusFile, uint64_t samplesToRead, uint64_t fillOpusBuffer(OggOpusFile* opusFile, int16_t* bufferOut);
int16_t* bufferOut);
int isOpus(const char* in); int isOpus(const char* in);