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
640ce6c5
Commit
640ce6c5
authored
Dec 09, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change mal_interleave/deinterleave_pcm_frames to take a 64-bit count.
parent
79cbe52e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
mini_al.h
mini_al.h
+10
-10
No files found.
mini_al.h
View file @
640ce6c5
...
@@ -1124,10 +1124,10 @@ void mal_pcm_f32_to_s32(void* pOut, const void* pIn, mal_uint64 count, mal_dithe
...
@@ -1124,10 +1124,10 @@ void mal_pcm_f32_to_s32(void* pOut, const void* pIn, mal_uint64 count, mal_dithe
void mal_pcm_convert(void* pOut, mal_format formatOut, const void* pIn, mal_format formatIn, mal_uint64 sampleCount, mal_dither_mode ditherMode);
void mal_pcm_convert(void* pOut, mal_format formatOut, const void* pIn, mal_format formatIn, mal_uint64 sampleCount, mal_dither_mode ditherMode);
// Deinterleaves an interleaved buffer.
// Deinterleaves an interleaved buffer.
void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
32
frameCount, const void* pInterleavedPCMFrames, void** ppDeinterleavedPCMFrames);
void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
64
frameCount, const void* pInterleavedPCMFrames, void** ppDeinterleavedPCMFrames);
// Interleaves a group of deinterleaved buffers.
// Interleaves a group of deinterleaved buffers.
void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
32
frameCount, const void** ppDeinterleavedPCMFrames, void* pInterleavedPCMFrames);
void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
64
frameCount, const void** ppDeinterleavedPCMFrames, void* pInterleavedPCMFrames);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
...
@@ -26238,7 +26238,7 @@ void mal_pcm_convert(void* pOut, mal_format formatOut, const void* pIn, mal_form
...
@@ -26238,7 +26238,7 @@ void mal_pcm_convert(void* pOut, mal_format formatOut, const void* pIn, mal_form
}
}
}
}
void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
32
frameCount, const void* pInterleavedPCMFrames, void** ppDeinterleavedPCMFrames)
void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
64
frameCount, const void* pInterleavedPCMFrames, void** ppDeinterleavedPCMFrames)
{
{
if (pInterleavedPCMFrames == NULL || ppDeinterleavedPCMFrames == NULL) {
if (pInterleavedPCMFrames == NULL || ppDeinterleavedPCMFrames == NULL) {
return; // Invalid args.
return; // Invalid args.
...
@@ -26249,7 +26249,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
...
@@ -26249,7 +26249,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
case mal_format_s16:
case mal_format_s16:
{
{
const mal_int16* pSrcS16 = (const mal_int16*)pInterleavedPCMFrames;
const mal_int16* pSrcS16 = (const mal_int16*)pInterleavedPCMFrames;
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
mal_int16* pDstS16 = (mal_int16*)ppDeinterleavedPCMFrames[iChannel];
mal_int16* pDstS16 = (mal_int16*)ppDeinterleavedPCMFrames[iChannel];
pDstS16[iPCMFrame] = pSrcS16[iPCMFrame*channels+iChannel];
pDstS16[iPCMFrame] = pSrcS16[iPCMFrame*channels+iChannel];
...
@@ -26260,7 +26260,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
...
@@ -26260,7 +26260,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
case mal_format_f32:
case mal_format_f32:
{
{
const float* pSrcF32 = (const float*)pInterleavedPCMFrames;
const float* pSrcF32 = (const float*)pInterleavedPCMFrames;
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
float* pDstF32 = (float*)ppDeinterleavedPCMFrames[iChannel];
float* pDstF32 = (float*)ppDeinterleavedPCMFrames[iChannel];
pDstF32[iPCMFrame] = pSrcF32[iPCMFrame*channels+iChannel];
pDstF32[iPCMFrame] = pSrcF32[iPCMFrame*channels+iChannel];
...
@@ -26272,7 +26272,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
...
@@ -26272,7 +26272,7 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
{
{
mal_uint32 sampleSizeInBytes = mal_get_bytes_per_sample(format);
mal_uint32 sampleSizeInBytes = mal_get_bytes_per_sample(format);
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
void* pDst = mal_offset_ptr(ppDeinterleavedPCMFrames[iChannel], iPCMFrame*sampleSizeInBytes);
void* pDst = mal_offset_ptr(ppDeinterleavedPCMFrames[iChannel], iPCMFrame*sampleSizeInBytes);
const void* pSrc = mal_offset_ptr(pInterleavedPCMFrames, (iPCMFrame*channels+iChannel)*sampleSizeInBytes);
const void* pSrc = mal_offset_ptr(pInterleavedPCMFrames, (iPCMFrame*channels+iChannel)*sampleSizeInBytes);
...
@@ -26283,14 +26283,14 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
...
@@ -26283,14 +26283,14 @@ void mal_deinterleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uin
}
}
}
}
void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
32
frameCount, const void** ppDeinterleavedPCMFrames, void* pInterleavedPCMFrames)
void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint
64
frameCount, const void** ppDeinterleavedPCMFrames, void* pInterleavedPCMFrames)
{
{
switch (format)
switch (format)
{
{
case mal_format_s16:
case mal_format_s16:
{
{
mal_int16* pDstS16 = (mal_int16*)pInterleavedPCMFrames;
mal_int16* pDstS16 = (mal_int16*)pInterleavedPCMFrames;
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
const mal_int16* pSrcS16 = (const mal_int16*)ppDeinterleavedPCMFrames[iChannel];
const mal_int16* pSrcS16 = (const mal_int16*)ppDeinterleavedPCMFrames[iChannel];
pDstS16[iPCMFrame*channels+iChannel] = pSrcS16[iPCMFrame];
pDstS16[iPCMFrame*channels+iChannel] = pSrcS16[iPCMFrame];
...
@@ -26301,7 +26301,7 @@ void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint3
...
@@ -26301,7 +26301,7 @@ void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint3
case mal_format_f32:
case mal_format_f32:
{
{
float* pDstF32 = (float*)pInterleavedPCMFrames;
float* pDstF32 = (float*)pInterleavedPCMFrames;
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
const float* pSrcF32 = (const float*)ppDeinterleavedPCMFrames[iChannel];
const float* pSrcF32 = (const float*)ppDeinterleavedPCMFrames[iChannel];
pDstF32[iPCMFrame*channels+iChannel] = pSrcF32[iPCMFrame];
pDstF32[iPCMFrame*channels+iChannel] = pSrcF32[iPCMFrame];
...
@@ -26313,7 +26313,7 @@ void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint3
...
@@ -26313,7 +26313,7 @@ void mal_interleave_pcm_frames(mal_format format, mal_uint32 channels, mal_uint3
{
{
mal_uint32 sampleSizeInBytes = mal_get_bytes_per_sample(format);
mal_uint32 sampleSizeInBytes = mal_get_bytes_per_sample(format);
for (mal_uint
32
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint
64
iPCMFrame = 0; iPCMFrame < frameCount; ++iPCMFrame) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
for (mal_uint32 iChannel = 0; iChannel < channels; ++iChannel) {
void* pDst = mal_offset_ptr(pInterleavedPCMFrames, (iPCMFrame*channels+iChannel)*sampleSizeInBytes);
void* pDst = mal_offset_ptr(pInterleavedPCMFrames, (iPCMFrame*channels+iChannel)*sampleSizeInBytes);
const void* pSrc = mal_offset_ptr(ppDeinterleavedPCMFrames[iChannel], iPCMFrame*sampleSizeInBytes);
const void* pSrc = mal_offset_ptr(ppDeinterleavedPCMFrames[iChannel], iPCMFrame*sampleSizeInBytes);
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