Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
miniaudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
miniaudio
Commits
02df9b2e
Commit
02df9b2e
authored
Jan 29, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update dr_wav, dr_flac and dr_mp3.
parent
68b96021
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
19 deletions
+34
-19
extras/dr_flac.h
extras/dr_flac.h
+7
-3
extras/dr_mp3.h
extras/dr_mp3.h
+8
-4
extras/dr_wav.h
extras/dr_wav.h
+19
-12
No files found.
extras/dr_flac.h
View file @
02df9b2e
/*
FLAC audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
dr_flac - v0.12.
3 - 2019-12-02
dr_flac - v0.12.
4 - 2020-01-29
David Reid - mackron@gmail.com
*/
...
...
@@ -4679,6 +4679,7 @@ static drflac_bool32 drflac__read_next_flac_frame_header(drflac_bs* bs, drflac_u
}
DRFLAC_ASSERT
(
blockSize
>
0
);
if
(
blockSize
==
1
)
{
header
->
blockSizeInPCMFrames
=
192
;
}
else
if
(
blockSize
>=
2
&&
blockSize
<=
5
)
{
...
...
@@ -10320,7 +10321,7 @@ drflac_bool32 drflac_seek_to_pcm_frame(drflac* pFlac, drflac_uint64 pcmFrameInde
#endif
{
/* First try seeking via the seek table. If this fails, fall back to a brute force seek which is much slower. */
if
(
!
wasSuccessful
&&
!
pFlac
->
_noSeekTableSeek
)
{
if
(
/*!wasSuccessful && */
!
pFlac
->
_noSeekTableSeek
)
{
wasSuccessful
=
drflac__seek_to_pcm_frame__seek_table
(
pFlac
,
pcmFrameIndex
);
}
...
...
@@ -10737,6 +10738,9 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter,
/*
REVISION HISTORY
================
v0.12.4 - 2020-01-29
- Silence some static analysis warnings.
v0.12.3 - 2019-12-02
- Fix some warnings when compiling with GCC and the -Og flag.
- Fix a crash in out-of-memory situations.
...
...
@@ -11041,7 +11045,7 @@ For more information, please refer to <http://unlicense.org/>
===============================================================================
ALTERNATIVE 2 - MIT No Attribution
===============================================================================
Copyright 20
18
David Reid
Copyright 20
20
David Reid
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
...
...
extras/dr_mp3.h
View file @
02df9b2e
/*
MP3 audio decoder. Choice of public domain or MIT-0. See license statements at the end of this file.
dr_mp3 - v0.5.
4 - 2019-12-02
dr_mp3 - v0.5.
5 - 2020-01-29
David Reid - mackron@gmail.com
...
...
@@ -823,7 +823,7 @@ static void drmp3_L12_read_scalefactors(drmp3_bs *bs, drmp3_uint8 *pba, drmp3_ui
if
(
mask
&
m
)
{
int
b
=
drmp3_bs_get_bits
(
bs
,
6
);
s
=
g_deq_L12
[
ba
*
3
-
6
+
b
%
3
]
*
(
1
<<
21
>>
b
/
3
);
s
=
g_deq_L12
[
ba
*
3
-
6
+
b
%
3
]
*
(
int
)(
1
<<
21
>>
b
/
3
);
}
*
scf
++
=
s
;
}
...
...
@@ -3890,6 +3890,7 @@ drmp3_int16* drmp3__full_read_and_close_s16(drmp3* pMP3, drmp3_config* pConfig,
}
pFrames
=
pNewFrames
;
framesCapacity
=
newFramesCap
;
}
DRMP3_COPY_MEMORY
(
pFrames
+
totalFramesRead
*
pMP3
->
channels
,
temp
,
(
size_t
)(
framesJustRead
*
pMP3
->
channels
*
sizeof
(
drmp3_int16
)));
...
...
@@ -4009,6 +4010,9 @@ DIFFERENCES BETWEEN minimp3 AND dr_mp3
/*
REVISION HISTORY
================
v0.5.5 - 2020-01-29
- Fix a memory allocation bug in high level s16 decoding APIs.
v0.5.4 - 2019-12-02
- Fix a possible null pointer dereference when using custom memory allocators for realloc().
...
...
@@ -4182,7 +4186,7 @@ For more information, please refer to <http://unlicense.org/>
===============================================================================
ALTERNATIVE 2 - MIT No Attribution
===============================================================================
Copyright 20
18
David Reid
Copyright 20
20
David Reid
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
...
...
extras/dr_wav.h
View file @
02df9b2e
/*
WAV audio loader and writer. Choice of public domain or MIT-0. See license statements at the end of this file.
dr_wav - v0.11.
3 - 2020-01-12
dr_wav - v0.11.
4 - 2020-01-29
David Reid - mackron@gmail.com
*/
...
...
@@ -1100,14 +1100,14 @@ static const drwav_uint8 drwavGUID_W64_SMPL[16] = {0x73,0x6D,0x70,0x6C, 0xF3,0xA
static
DRWAV_INLINE
drwav_bool32
drwav__guid_equal
(
const
drwav_uint8
a
[
16
],
const
drwav_uint8
b
[
16
])
{
const
drwav_uint32
*
a32
=
(
const
drwav_uint32
*
)
a
;
const
drwav_uint32
*
b32
=
(
const
drwav_uint32
*
)
b
;
int
i
;
for
(
i
=
0
;
i
<
16
;
i
+=
1
)
{
if
(
a
[
i
]
!=
b
[
i
])
{
return
DRWAV_FALSE
;
}
}
return
a32
[
0
]
==
b32
[
0
]
&&
a32
[
1
]
==
b32
[
1
]
&&
a32
[
2
]
==
b32
[
2
]
&&
a32
[
3
]
==
b32
[
3
];
return
DRWAV_TRUE
;
}
static
DRWAV_INLINE
drwav_bool32
drwav__fourcc_equal
(
const
unsigned
char
*
a
,
const
char
*
b
)
...
...
@@ -3579,7 +3579,8 @@ static void drwav__pcm_to_s16(drwav_int16* pOut, const unsigned char* pIn, size_
unsigned
int
shift
=
(
8
-
bytesPerSample
)
*
8
;
unsigned
int
j
;
for
(
j
=
0
;
j
<
bytesPerSample
&&
j
<
8
;
j
+=
1
)
{
for
(
j
=
0
;
j
<
bytesPerSample
;
j
+=
1
)
{
DRWAV_ASSERT
(
j
<
8
);
sample
|=
(
drwav_uint64
)(
pIn
[
j
])
<<
shift
;
shift
+=
8
;
}
...
...
@@ -3901,7 +3902,8 @@ static void drwav__pcm_to_f32(float* pOut, const unsigned char* pIn, size_t samp
unsigned
int
shift
=
(
8
-
bytesPerSample
)
*
8
;
unsigned
int
j
;
for
(
j
=
0
;
j
<
bytesPerSample
&&
j
<
8
;
j
+=
1
)
{
for
(
j
=
0
;
j
<
bytesPerSample
;
j
+=
1
)
{
DRWAV_ASSERT
(
j
<
8
);
sample
|=
(
drwav_uint64
)(
pIn
[
j
])
<<
shift
;
shift
+=
8
;
}
...
...
@@ -4051,7 +4053,7 @@ drwav_uint64 drwav_read_pcm_frames_f32__alaw(drwav* pWav, drwav_uint64 framesToR
totalFramesRead
=
0
;
while
(
bytesPerFrame
>
0
)
{
while
(
framesToRead
>
0
)
{
drwav_uint64
framesRead
=
drwav_read_pcm_frames
(
pWav
,
drwav_min
(
framesToRead
,
sizeof
(
sampleData
)
/
bytesPerFrame
),
sampleData
);
if
(
framesRead
==
0
)
{
break
;
...
...
@@ -4303,7 +4305,8 @@ static void drwav__pcm_to_s32(drwav_int32* pOut, const unsigned char* pIn, size_
unsigned
int
shift
=
(
8
-
bytesPerSample
)
*
8
;
unsigned
int
j
;
for
(
j
=
0
;
j
<
bytesPerSample
&&
j
<
8
;
j
+=
1
)
{
for
(
j
=
0
;
j
<
bytesPerSample
;
j
+=
1
)
{
DRWAV_ASSERT
(
j
<
8
);
sample
|=
(
drwav_uint64
)(
pIn
[
j
])
<<
shift
;
shift
+=
8
;
}
...
...
@@ -5052,6 +5055,10 @@ void drwav_free(void* p, const drwav_allocation_callbacks* pAllocationCallbacks)
/*
REVISION HISTORY
================
v0.11.4 - 2020-01-29
- Fix some static analysis warnings.
- Fix a bug when reading f32 samples from an A-law encoded stream.
v0.11.3 - 2020-01-12
- Minor changes to some f32 format conversion routines.
- Minor bug fix for ADPCM conversion when end of file is reached.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment