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
a95005af
Commit
a95005af
authored
Mar 25, 2018
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a sine wave generator.
parent
0a3d077c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
84 additions
and
1 deletion
+84
-1
mini_al.h
mini_al.h
+84
-1
No files found.
mini_al.h
View file @
a95005af
...
@@ -2013,7 +2013,25 @@ mal_result mal_decoder_uninit(mal_decoder* pDecoder);
...
@@ -2013,7 +2013,25 @@ mal_result mal_decoder_uninit(mal_decoder* pDecoder);
mal_uint64 mal_decoder_read(mal_decoder* pDecoder, mal_uint64 frameCount, void* pFramesOut);
mal_uint64 mal_decoder_read(mal_decoder* pDecoder, mal_uint64 frameCount, void* pFramesOut);
mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameIndex);
mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameIndex);
#endif
#endif // MAL_NO_DECODING
///////////////////////////////////////////////////////////////////////////////
//
// Generation
//
///////////////////////////////////////////////////////////////////////////////
typedef struct
{
double amplitude;
double periodsPerSecond;
double delta;
double time;
} mal_sine_wave;
mal_result mal_sine_wave_init(double amplitude, double period, mal_uint32 sampleRate, mal_sine_wave* pSignWave);
mal_uint64 mal_sine_wave_read(mal_sine_wave* pSignWave, mal_uint64 count, float* pSamples);
#ifdef __cplusplus
#ifdef __cplusplus
...
@@ -2032,6 +2050,7 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
...
@@ -2032,6 +2050,7 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
#ifdef MAL_IMPLEMENTATION
#ifdef MAL_IMPLEMENTATION
#include <assert.h>
#include <assert.h>
#include <limits.h> // For INT_MAX
#include <limits.h> // For INT_MAX
#include <math.h> // sin(), etc.
#ifdef MAL_WIN32
#ifdef MAL_WIN32
#include <windows.h>
#include <windows.h>
...
@@ -2078,6 +2097,13 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
...
@@ -2078,6 +2097,13 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
#endif
#endif
#endif
#endif
#ifndef MAL_PI
#define MAL_PI 3.14159265358979323846264f
#endif
#ifndef MAL_PI_D
#define MAL_PI_D 3.14159265358979323846264
#endif
// Unfortunately using runtime linking for pthreads causes problems. This has occurred for me when testing on FreeBSD. When
// Unfortunately using runtime linking for pthreads causes problems. This has occurred for me when testing on FreeBSD. When
// using runtime linking, deadlocks can occur (for me it happens when loading data from fread()). It turns out that doing
// using runtime linking, deadlocks can occur (for me it happens when loading data from fread()). It turns out that doing
// compile-time linking fixes this. I'm not sure why this happens, but this is the safest way I can think of to continue. To
// compile-time linking fixes this. I'm not sure why this happens, but this is the safest way I can think of to continue. To
...
@@ -19325,6 +19351,62 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
...
@@ -19325,6 +19351,62 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
}
}
#endif // MAL_NO_DECODING
#endif // MAL_NO_DECODING
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// GENERATION
//
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
mal_result mal_sine_wave_init(double amplitude, double periodsPerSecond, mal_uint32 sampleRate, mal_sine_wave* pSignWave)
{
if (pSignWave == NULL) {
return MAL_INVALID_ARGS;
}
mal_zero_object(pSignWave);
if (amplitude == 0 || periodsPerSecond == 0) {
return MAL_INVALID_ARGS;
}
if (amplitude > 1) {
amplitude = 1;
}
if (amplitude < -1) {
amplitude = -1;
}
pSignWave->amplitude = amplitude;
pSignWave->periodsPerSecond = periodsPerSecond;
pSignWave->delta = MAL_PI_D*2 / sampleRate;
pSignWave->time = 0;
return MAL_SUCCESS;
}
mal_uint64 mal_sine_wave_read(mal_sine_wave* pSignWave, mal_uint64 count, float* pSamples)
{
if (pSignWave == NULL) {
return 0;
}
if (pSamples != NULL) {
for (mal_uint64 i = 0; i < count; i += 1) {
pSamples[i] = (float)(sin(pSignWave->time * pSignWave->periodsPerSecond) * pSignWave->amplitude);
pSignWave->time += pSignWave->delta;
}
} else {
pSignWave->time += pSignWave->delta * count;
}
return count;
}
#endif // MAL_IMPLEMENTATION
#endif // MAL_IMPLEMENTATION
...
@@ -19355,6 +19437,7 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
...
@@ -19355,6 +19437,7 @@ mal_result mal_decoder_seek_to_frame(mal_decoder* pDecoder, mal_uint64 frameInde
// - Remove dependency on audioclient.h for the WASAPI backend. This fixes build issues with some
// - Remove dependency on audioclient.h for the WASAPI backend. This fixes build issues with some
// distributions of MinGW.
// distributions of MinGW.
// - Add support for configuring the priority of the worker thread.
// - Add support for configuring the priority of the worker thread.
// - Add a sine wave generator.
// - Introduce the notion of standard channel maps. Use mal_get_standard_channel_map().
// - Introduce the notion of standard channel maps. Use mal_get_standard_channel_map().
// - Introduce the notion of default device configurations. A default config uses the same configuration
// - Introduce the notion of default device configurations. A default config uses the same configuration
// as the backend's internal device, and as such results in a pass-through data transmission pipeline.
// as the backend's internal device, and as such results in a pass-through data transmission pipeline.
...
...
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