1
0
mirror of https://github.com/libretro/RetroArch synced 2024-07-05 09:48:42 +00:00

(PS3) Add HAVE_DR_FLAC

(Dr. Flac) Fix some warnings with PS3 compiler
This commit is contained in:
twinaphex 2018-05-07 17:52:53 +02:00
parent 4f549bc55c
commit c79950d707
2 changed files with 24 additions and 24 deletions

View File

@ -63,7 +63,7 @@ endif
PPU_SRCS = griffin/griffin.c
DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3
DEFINES += -DHAVE_MENU -DHAVE_RGUI -DHAVE_XMB -DHAVE_LIBRETRODB -DHAVE_MATERIALUI -DHAVE_SHADERPIPELINE -DRARCH_INTERNAL -DMSB_FIRST -DHAVE_OVERLAY -DHAVE_CC_RESAMPLER -DHAVE_STB_VORBIS -DHAVE_STB_FONT -DHAVE_RUNAHEAD -DHAVE_DR_MP3 -DHAVE_DR_FLAC
ifeq ($(DEX_BUILD), 1)
DEFINES += -DDEX_BUILD

46
deps/dr/dr_flac.h vendored
View File

@ -2139,11 +2139,11 @@ static drflac_bool32 drflac__read_rice_parts__reference(drflac_bs* bs, drflac_ui
static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac_uint8 riceParam, drflac_uint32* pZeroCounterOut, drflac_uint32* pRiceParamPartOut)
{
drflac_uint32 riceLength;
drflac_uint32 riceParamPart;
drflac_uint32 riceParamPart = 0;
drflac_uint32 setBitOffsetPlus1;
drflac_cache_t riceParamMask = DRFLAC_CACHE_L1_SELECTION_MASK(riceParam);
drflac_cache_t resultHiShift = DRFLAC_CACHE_L1_SIZE_BITS(bs) - riceParam;
drflac_uint32 zeroCounter = 0;
drflac_cache_t riceParamMask = DRFLAC_CACHE_L1_SELECTION_MASK(riceParam);
drflac_cache_t resultHiShift = DRFLAC_CACHE_L1_SIZE_BITS(bs) - riceParam;
drflac_uint32 zeroCounter = 0;
while (bs->cache == 0) {
zeroCounter += (drflac_uint32)DRFLAC_CACHE_L1_BITS_REMAINING(bs);
if (!drflac__reload_cache(bs))
@ -2206,9 +2206,9 @@ static DRFLAC_INLINE drflac_bool32 drflac__read_rice_parts(drflac_bs* bs, drflac
static drflac_bool32 drflac__decode_samples_with_residual__rice__simple(drflac_bs* bs, drflac_uint32 bitsPerSample, drflac_uint32 count, drflac_uint8 riceParam, drflac_uint32 order, drflac_int32 shift, const drflac_int32* coefficients, drflac_int32* pSamplesOut)
{
drflac_uint32 zeroCountPart;
drflac_uint32 riceParamPart;
drflac_uint32 i = 0;
drflac_uint32 zeroCountPart = 0;
drflac_uint32 riceParamPart = 0;
drflac_uint32 i = 0;
drflac_assert(bs != NULL);
drflac_assert(count > 0);
@ -2564,13 +2564,13 @@ static drflac_bool32 drflac__read_next_frame_header(drflac_bs* bs, drflac_uint8
for (;;)
{
drflac_bool32 isVariableBlockSize = false;
drflac_uint8 blockSize = 0;
drflac_uint8 blockingStrategy = 0;
drflac_uint8 crc8 = 0xCE; /* 0xCE = drflac_crc8(0, 0x3FFE, 14); */
drflac_uint8 reserved = 0;
drflac_uint8 sampleRate = 0;
drflac_uint8 channelAssignment = 0;
drflac_uint8 bitsPerSample = 0;
drflac_uint8 blockSize = 0;
drflac_uint8 blockingStrategy = 0;
drflac_uint8 crc8 = 0xCE; /* 0xCE = drflac_crc8(0, 0x3FFE, 14); */
drflac_uint8 reserved = 0;
drflac_uint8 sampleRate = 0;
drflac_uint8 channelAssignment = 0;
drflac_uint8 bitsPerSample = 0;
if (!drflac__find_and_seek_to_next_sync_code(bs))
return DRFLAC_FALSE;
@ -2738,7 +2738,7 @@ static drflac_bool32 drflac__read_subframe_header(drflac_bs* bs, drflac_subframe
pSubframe->wastedBitsPerSample = 0;
if ((header & 0x01) == 1)
{
unsigned int wastedBitsPerSample;
unsigned int wastedBitsPerSample = 0;
if (!drflac__seek_past_next_set_bit(bs, &wastedBitsPerSample))
return DRFLAC_FALSE;
pSubframe->wastedBitsPerSample = (unsigned char)wastedBitsPerSample + 1;
@ -3301,8 +3301,8 @@ drflac_bool32 drflac__read_and_decode_metadata(drflac* pFlac)
{
drflac_metadata metadata;
drflac_uint8 isLastBlock = 0;
drflac_uint8 blockType;
drflac_uint32 blockSize;
drflac_uint8 blockType = 0;
drflac_uint32 blockSize = 0;
if (!drflac__read_and_decode_block_header(pFlac->bs.onRead, pFlac->bs.pUserData, &isLastBlock, &blockType, &blockSize))
return DRFLAC_FALSE;
@ -3536,9 +3536,9 @@ drflac_bool32 drflac__read_and_decode_metadata(drflac* pFlac)
drflac_bool32 drflac__init_private__native(drflac_init_info* pInit, drflac_read_proc onRead, drflac_seek_proc onSeek, drflac_meta_proc onMeta, void* pUserData, void* pUserDataMD, drflac_bool32 relaxed)
{
drflac_uint8 isLastBlock;
drflac_uint8 blockType;
drflac_uint32 blockSize;
drflac_uint8 isLastBlock = 0;
drflac_uint8 blockType = 0;
drflac_uint32 blockSize = 0;
(void)onSeek;
@ -4294,9 +4294,9 @@ drflac_bool32 drflac__init_private__ogg(drflac_init_info* pInit, drflac_read_pro
{
drflac_streaminfo streaminfo;
/* The remaining data in the page should be the STREAMINFO block. */
drflac_uint8 isLastBlock;
drflac_uint8 blockType;
drflac_uint32 blockSize;
drflac_uint8 isLastBlock = 0;
drflac_uint8 blockType = 0;
drflac_uint32 blockSize = 0;
if (!drflac__read_and_decode_block_header(onRead, pUserData, &isLastBlock, &blockType, &blockSize))
return DRFLAC_FALSE;