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
859720ec
Commit
859720ec
authored
Apr 29, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add helpers for initializing format converter configs.
parent
994c86fc
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
5 deletions
+30
-5
mini_al.h
mini_al.h
+27
-0
tests/mal_dithering.c
tests/mal_dithering.c
+3
-5
No files found.
mini_al.h
View file @
859720ec
...
@@ -1971,6 +1971,11 @@ mal_uint64 mal_format_converter_read(mal_format_converter* pConverter, mal_uint6
...
@@ -1971,6 +1971,11 @@ mal_uint64 mal_format_converter_read(mal_format_converter* pConverter, mal_uint6
mal_uint64
mal_format_converter_read_deinterleaved
(
mal_format_converter
*
pConverter
,
mal_uint64
frameCount
,
void
**
ppSamplesOut
,
void
*
pUserData
);
mal_uint64
mal_format_converter_read_deinterleaved
(
mal_format_converter
*
pConverter
,
mal_uint64
frameCount
,
void
**
ppSamplesOut
,
void
*
pUserData
);
// Helper for initializing a format converter config.
mal_format_converter_config
mal_format_converter_config_init_new
();
mal_format_converter_config
mal_format_converter_config_init
(
mal_format
formatIn
,
mal_format
formatOut
,
mal_uint32
channels
,
mal_format_converter_read_proc
onRead
,
mal_format_converter_read_deinterleaved_proc
onReadDeinterleaved
,
void
*
pUserData
);
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
//
...
@@ -18558,6 +18563,28 @@ mal_uint64 mal_format_converter_read_deinterleaved(mal_format_converter* pConver
...
@@ -18558,6 +18563,28 @@ mal_uint64 mal_format_converter_read_deinterleaved(mal_format_converter* pConver
}
}
mal_format_converter_config
mal_format_converter_config_init_new
()
{
mal_format_converter_config
config
;
mal_zero_object
(
&
config
);
return
config
;
}
mal_format_converter_config
mal_format_converter_config_init
(
mal_format
formatIn
,
mal_format
formatOut
,
mal_uint32
channels
,
mal_format_converter_read_proc
onRead
,
mal_format_converter_read_deinterleaved_proc
onReadDeinterleaved
,
void
*
pUserData
)
{
mal_format_converter_config
config
=
mal_format_converter_config_init_new
();
config
.
formatIn
=
formatIn
;
config
.
formatOut
=
formatOut
;
config
.
channels
=
channels
;
config
.
onRead
=
onRead
;
config
.
onReadDeinterleaved
=
onReadDeinterleaved
;
config
.
pUserData
=
pUserData
;
return
config
;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
//
...
...
tests/mal_dithering.c
View file @
859720ec
...
@@ -78,11 +78,10 @@ int do_dithering_test()
...
@@ -78,11 +78,10 @@ int do_dithering_test()
mal_sine_wave_init
(
0
.
5
,
400
,
48000
,
&
sineWave
);
mal_sine_wave_init
(
0
.
5
,
400
,
48000
,
&
sineWave
);
mal_format
srcFormat
=
mal_format_s24
;
mal_format
srcFormat
=
mal_format_s24
;
mal_format
dstFormat
=
mal_format_
s16
;
mal_format
dstFormat
=
mal_format_
u8
;
mal_dither_mode
ditherMode
=
mal_dither_mode_triangle
;
mal_dither_mode
ditherMode
=
mal_dither_mode_triangle
;
mal_format_converter_config
converterInConfig
;
mal_format_converter_config
converterInConfig
=
mal_format_converter_config_init_new
();
mal_zero_object
(
&
converterInConfig
);
converterInConfig
.
formatIn
=
mal_format_f32
;
// <-- From the sine wave generator.
converterInConfig
.
formatIn
=
mal_format_f32
;
// <-- From the sine wave generator.
converterInConfig
.
formatOut
=
srcFormat
;
converterInConfig
.
formatOut
=
srcFormat
;
converterInConfig
.
channels
=
config
.
channels
;
converterInConfig
.
channels
=
config
.
channels
;
...
@@ -94,8 +93,7 @@ int do_dithering_test()
...
@@ -94,8 +93,7 @@ int do_dithering_test()
return
-
3
;
return
-
3
;
}
}
mal_format_converter_config
converterOutConfig
;
mal_format_converter_config
converterOutConfig
=
mal_format_converter_config_init_new
();
mal_zero_object
(
&
converterInConfig
);
converterOutConfig
.
formatIn
=
srcFormat
;
converterOutConfig
.
formatIn
=
srcFormat
;
converterOutConfig
.
formatOut
=
dstFormat
;
converterOutConfig
.
formatOut
=
dstFormat
;
converterOutConfig
.
channels
=
config
.
channels
;
converterOutConfig
.
channels
=
config
.
channels
;
...
...
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