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
0e45b95e
Commit
0e45b95e
authored
Dec 26, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rearrange some function parameters in miniaudio_engine.
parent
4e9becd5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
research/miniaudio_engine.h
research/miniaudio_engine.h
+10
-10
No files found.
research/miniaudio_engine.h
View file @
0e45b95e
...
...
@@ -2743,7 +2743,7 @@ static ma_result ma_volume_and_clip_and_effect_pcm_frames(void* pDst, ma_format
}
static
ma_result
ma_mix_pcm_frames_u8
(
ma_int16
*
pDst
,
const
ma_uint8
*
pSrc
,
ma_uint
32
channels
,
ma_uint64
frameCount
,
float
volume
)
static
ma_result
ma_mix_pcm_frames_u8
(
ma_int16
*
pDst
,
const
ma_uint8
*
pSrc
,
ma_uint
64
frameCount
,
ma_uint32
channels
,
float
volume
)
{
ma_uint64
iSample
;
ma_uint64
sampleCount
;
...
...
@@ -2772,7 +2772,7 @@ static ma_result ma_mix_pcm_frames_u8(ma_int16* pDst, const ma_uint8* pSrc, ma_u
return
MA_SUCCESS
;
}
static
ma_result
ma_mix_pcm_frames_s16
(
ma_int32
*
pDst
,
const
ma_int16
*
pSrc
,
ma_uint
32
channels
,
ma_uint64
frameCount
,
float
volume
)
static
ma_result
ma_mix_pcm_frames_s16
(
ma_int32
*
pDst
,
const
ma_int16
*
pSrc
,
ma_uint
64
frameCount
,
ma_uint32
channels
,
float
volume
)
{
ma_uint64
iSample
;
ma_uint64
sampleCount
;
...
...
@@ -2801,7 +2801,7 @@ static ma_result ma_mix_pcm_frames_s16(ma_int32* pDst, const ma_int16* pSrc, ma_
return
MA_SUCCESS
;
}
static
ma_result
ma_mix_pcm_frames_s24
(
ma_int64
*
pDst
,
const
ma_uint8
*
pSrc
,
ma_uint
32
channels
,
ma_uint64
frameCount
,
float
volume
)
static
ma_result
ma_mix_pcm_frames_s24
(
ma_int64
*
pDst
,
const
ma_uint8
*
pSrc
,
ma_uint
64
frameCount
,
ma_uint32
channels
,
float
volume
)
{
ma_uint64
iSample
;
ma_uint64
sampleCount
;
...
...
@@ -2830,7 +2830,7 @@ static ma_result ma_mix_pcm_frames_s24(ma_int64* pDst, const ma_uint8* pSrc, ma_
return
MA_SUCCESS
;
}
static
ma_result
ma_mix_pcm_frames_s32
(
ma_int64
*
pDst
,
const
ma_int32
*
pSrc
,
ma_uint
32
channels
,
ma_uint64
frameCount
,
float
volume
)
static
ma_result
ma_mix_pcm_frames_s32
(
ma_int64
*
pDst
,
const
ma_int32
*
pSrc
,
ma_uint
64
frameCount
,
ma_uint32
channels
,
float
volume
)
{
ma_uint64
iSample
;
ma_uint64
sampleCount
;
...
...
@@ -2860,7 +2860,7 @@ static ma_result ma_mix_pcm_frames_s32(ma_int64* pDst, const ma_int32* pSrc, ma_
return
MA_SUCCESS
;
}
static
ma_result
ma_mix_pcm_frames_f32
(
float
*
pDst
,
const
float
*
pSrc
,
ma_uint
32
channels
,
ma_uint64
frameCount
,
float
volume
)
static
ma_result
ma_mix_pcm_frames_f32
(
float
*
pDst
,
const
float
*
pSrc
,
ma_uint
64
frameCount
,
ma_uint32
channels
,
float
volume
)
{
ma_uint64
iSample
;
ma_uint64
sampleCount
;
...
...
@@ -2894,11 +2894,11 @@ static ma_result ma_mix_pcm_frames(void* pDst, const void* pSrc, ma_uint64 frame
switch
(
format
)
{
case
ma_format_u8
:
result
=
ma_mix_pcm_frames_u8
(
(
ma_int16
*
)
pDst
,
(
const
ma_uint8
*
)
pSrc
,
channels
,
frameCount
,
volume
);
break
;
case
ma_format_s16
:
result
=
ma_mix_pcm_frames_s16
((
ma_int32
*
)
pDst
,
(
const
ma_int16
*
)
pSrc
,
channels
,
frameCount
,
volume
);
break
;
case
ma_format_s24
:
result
=
ma_mix_pcm_frames_s24
((
ma_int64
*
)
pDst
,
(
const
ma_uint8
*
)
pSrc
,
channels
,
frameCount
,
volume
);
break
;
case
ma_format_s32
:
result
=
ma_mix_pcm_frames_s32
((
ma_int64
*
)
pDst
,
(
const
ma_int32
*
)
pSrc
,
channels
,
frameCount
,
volume
);
break
;
case
ma_format_f32
:
result
=
ma_mix_pcm_frames_f32
((
float
*
)
pDst
,
(
const
float
*
)
pSrc
,
channels
,
frameCount
,
volume
);
break
;
case
ma_format_u8
:
result
=
ma_mix_pcm_frames_u8
(
(
ma_int16
*
)
pDst
,
(
const
ma_uint8
*
)
pSrc
,
frameCount
,
channels
,
volume
);
break
;
case
ma_format_s16
:
result
=
ma_mix_pcm_frames_s16
((
ma_int32
*
)
pDst
,
(
const
ma_int16
*
)
pSrc
,
frameCount
,
channels
,
volume
);
break
;
case
ma_format_s24
:
result
=
ma_mix_pcm_frames_s24
((
ma_int64
*
)
pDst
,
(
const
ma_uint8
*
)
pSrc
,
frameCount
,
channels
,
volume
);
break
;
case
ma_format_s32
:
result
=
ma_mix_pcm_frames_s32
((
ma_int64
*
)
pDst
,
(
const
ma_int32
*
)
pSrc
,
frameCount
,
channels
,
volume
);
break
;
case
ma_format_f32
:
result
=
ma_mix_pcm_frames_f32
((
float
*
)
pDst
,
(
const
float
*
)
pSrc
,
frameCount
,
channels
,
volume
);
break
;
default:
return
MA_INVALID_ARGS
;
/* Unknown format. */
}
...
...
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