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
a8557e82
Commit
a8557e82
authored
Aug 28, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Version 0.10.17
parent
3b840235
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
14 deletions
+41
-14
extras/miniaudio_split/miniaudio.c
extras/miniaudio_split/miniaudio.c
+32
-10
extras/miniaudio_split/miniaudio.h
extras/miniaudio_split/miniaudio.h
+7
-2
miniaudio.h
miniaudio.h
+2
-2
No files found.
extras/miniaudio_split/miniaudio.c
View file @
a8557e82
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.1
6 - 2020-08-14
miniaudio - v0.10.1
7 - 2020-08-28
David Reid - davidreidsoftware@gmail.com
...
...
@@ -4498,7 +4498,7 @@ static ma_result ma_device__handle_duplex_callback_capture(ma_device* pDevice, m
break;
}
result = ma_pcm_rb_commit_write(pRB, (ma_uint32)framesProcessedIn
Device
Format, pFramesInClientFormat); /* Safe cast. */
result = ma_pcm_rb_commit_write(pRB, (ma_uint32)framesProcessedIn
Client
Format, pFramesInClientFormat); /* Safe cast. */
if (result != MA_SUCCESS) {
ma_post_error(pDevice, MA_LOG_LEVEL_ERROR, "Failed to commit capture PCM frames to ring buffer.", result);
break;
...
...
@@ -35942,7 +35942,7 @@ MA_API ma_uint64 ma_audio_buffer_read_pcm_frames(ma_audio_buffer* pAudioBuffer,
MA_ASSERT(pAudioBuffer->cursor < pAudioBuffer->sizeInFrames);
}
return
frameCount
;
return
totalFramesRead
;
}
MA_API ma_result ma_audio_buffer_seek_to_pcm_frame(ma_audio_buffer* pAudioBuffer, ma_uint64 frameIndex)
...
...
@@ -36851,7 +36851,7 @@ MA_API ma_result ma_default_vfs_init(ma_default_vfs* pVFS, const ma_allocation_c
Decoding and Encoding Headers. These are auto-generated from a tool.
**************************************************************************************************************************************************************/
#if !defined(MA_NO_WAV) &&
!defined(MA_NO_DECODING) && !defined(MA_NO_ENCODING
)
#if !defined(MA_NO_WAV) &&
(!defined(MA_NO_DECODING) || !defined(MA_NO_ENCODING)
)
/* dr_wav_h begin */
#ifndef dr_wav_h
#define dr_wav_h
...
...
@@ -36862,7 +36862,7 @@ extern "C" {
#define DRWAV_XSTRINGIFY(x) DRWAV_STRINGIFY(x)
#define DRWAV_VERSION_MAJOR 0
#define DRWAV_VERSION_MINOR 12
#define DRWAV_VERSION_REVISION
9
#define DRWAV_VERSION_REVISION
10
#define DRWAV_VERSION_STRING DRWAV_XSTRINGIFY(DRWAV_VERSION_MAJOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_MINOR) "." DRWAV_XSTRINGIFY(DRWAV_VERSION_REVISION)
#include <stddef.h>
typedef signed char drwav_int8;
...
...
@@ -38819,13 +38819,11 @@ static ma_result ma_decoder__data_source_on_get_data_format(ma_data_source* pDat
return MA_SUCCESS;
}
static ma_result ma_decoder__data_source_on_get_cursor(ma_data_source* pDataSource, ma_uint64* p
Cursor
)
static ma_result ma_decoder__data_source_on_get_cursor(ma_data_source* pDataSource, ma_uint64* p
Length
)
{
ma_decoder* pDecoder = (ma_decoder*)pDataSource;
*pCursor = pDecoder->readPointerInPCMFrames;
return MA_SUCCESS;
return ma_decoder_get_cursor_in_pcm_frames(pDecoder, pLength);
}
static ma_result ma_decoder__data_source_on_get_length(ma_data_source* pDataSource, ma_uint64* pLength)
...
...
@@ -40023,6 +40021,23 @@ MA_API ma_result ma_decoder_uninit(ma_decoder* pDecoder)
return MA_SUCCESS;
}
MA_API ma_result ma_decoder_get_cursor_in_pcm_frames(ma_decoder* pDecoder, ma_uint64* pCursor)
{
if (pCursor == NULL) {
return MA_INVALID_ARGS;
}
*pCursor = 0;
if (pDecoder == NULL) {
return MA_INVALID_ARGS;
}
*pCursor = pDecoder->readPointerInPCMFrames;
return MA_SUCCESS;
}
MA_API ma_uint64 ma_decoder_get_length_in_pcm_frames(ma_decoder* pDecoder)
{
if (pDecoder == NULL) {
...
...
@@ -41371,7 +41386,7 @@ code below please report the bug to the respective repository for the relevant p
***************************************************************************************************************************************************************
**************************************************************************************************************************************************************/
#if !defined(MA_NO_WAV) &&
!defined(MA_NO_DECODING) && !defined(MA_NO_ENCODING
)
#if !defined(MA_NO_WAV) &&
(!defined(MA_NO_DECODING) || !defined(MA_NO_ENCODING)
)
#if !defined(DR_WAV_IMPLEMENTATION) && !defined(DRWAV_IMPLEMENTATION) /* For backwards compatibility. Will be removed in version 0.11 for cleanliness. */
/* dr_wav_c begin */
#ifndef dr_wav_c
...
...
@@ -43407,6 +43422,13 @@ DRWAV_API drwav_bool32 drwav_seek_to_first_pcm_frame(drwav* pWav)
}
if (drwav__is_compressed_format_tag(pWav->translatedFormatTag)) {
pWav->compressed.iCurrentPCMFrame = 0;
if (pWav->translatedFormatTag == DR_WAVE_FORMAT_ADPCM) {
DRWAV_ZERO_OBJECT(&pWav->msadpcm);
} else if (pWav->translatedFormatTag == DR_WAVE_FORMAT_DVI_ADPCM) {
DRWAV_ZERO_OBJECT(&pWav->ima);
} else {
DRWAV_ASSERT(DRWAV_FALSE);
}
}
pWav->bytesRemaining = pWav->dataChunkDataSize;
return DRWAV_TRUE;
extras/miniaudio_split/miniaudio.h
View file @
a8557e82
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.1
6 - 2020-08-14
miniaudio - v0.10.1
7 - 2020-08-28
David Reid - davidreidsoftware@gmail.com
...
...
@@ -20,7 +20,7 @@ extern "C" {
#define MA_VERSION_MAJOR 0
#define MA_VERSION_MINOR 10
#define MA_VERSION_REVISION 1
6
#define MA_VERSION_REVISION 1
7
#define MA_VERSION_STRING MA_XSTRINGIFY(MA_VERSION_MAJOR) "." MA_XSTRINGIFY(MA_VERSION_MINOR) "." MA_XSTRINGIFY(MA_VERSION_REVISION)
#if defined(_MSC_VER) && !defined(__clang__)
...
...
@@ -4083,6 +4083,11 @@ MA_API ma_result ma_decoder_init_file_vorbis_w(const wchar_t* pFilePath, const m
MA_API
ma_result
ma_decoder_uninit
(
ma_decoder
*
pDecoder
);
/*
Retrieves the current position of the read cursor in PCM frames.
*/
MA_API
ma_result
ma_decoder_get_cursor_in_pcm_frames
(
ma_decoder
*
pDecoder
,
ma_uint64
*
pCursor
);
/*
Retrieves the length of the decoder in PCM frames.
...
...
miniaudio.h
View file @
a8557e82
/*
Audio playback and capture library. Choice of public domain or MIT-0. See license statements at the end of this file.
miniaudio - v0.10.17 -
TBD
miniaudio - v0.10.17 -
2020-08-28
David Reid - davidreidsoftware@gmail.com
...
...
@@ -62485,7 +62485,7 @@ The following miscellaneous changes have also been made.
/*
REVISION HISTORY
================
v0.10.17 -
TBD
v0.10.17 -
2020-08-28
- Fix an error where the WAV codec is incorrectly excluded from the build depending on which compile time options are set.
- Fix a bug in ma_audio_buffer_read_pcm_frames() where it isn't returning the correct number of frames processed.
- Fix compilation error on Android.
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