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
fcb40588
Commit
fcb40588
authored
Jul 11, 2021
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ma_calculate_frame_count_after_resampling()
This removes the dependency on the ma_resampler object.
parent
d8314ba3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
miniaudio.h
miniaudio.h
+15
-14
No files found.
miniaudio.h
View file @
fcb40588
...
@@ -10458,28 +10458,29 @@ static C89ATOMIC_INLINE void c89atomic_spinlock_unlock(volatile c89atomic_spinlo
...
@@ -10458,28 +10458,29 @@ static C89ATOMIC_INLINE void c89atomic_spinlock_unlock(volatile c89atomic_spinlo
MA_API ma_uint64 ma_calculate_frame_count_after_resampling(ma_uint32 sampleRateOut, ma_uint32 sampleRateIn, ma_uint64 frameCountIn)
MA_API ma_uint64 ma_calculate_frame_count_after_resampling(ma_uint32 sampleRateOut, ma_uint32 sampleRateIn, ma_uint64 frameCountIn)
{
{
/* TODO: Change this so we're not initializing a resampler because this will introduce a malloc. */
/* This is based on the calculation in ma_linear_resampler_get_expected_output_frame_count(). */
ma_uint64 outputFrameCount;
ma_uint64 preliminaryInputFrameCountFromFrac;
ma_uint64 preliminaryInputFrameCount;
/* For robustness we're going to use a resampler object to calculate this since that already has a way of calculating this. */
if (sampleRateIn == 0 || sampleRateOut == 0) {
ma_result result;
return 0;
ma_uint64 frameCountOut;
}
ma_resampler_config config;
ma_resampler resampler;
if (sampleRateOut == sampleRateIn) {
if (sampleRateOut == sampleRateIn) {
return frameCountIn;
return frameCountIn;
}
}
config = ma_resampler_config_init(ma_format_s16, 1, sampleRateIn, sampleRateOut, ma_resample_algorithm_linear);
outputFrameCount = (frameCountIn * sampleRateOut) / sampleRateIn;
result = ma_resampler_init(&config, NULL, &resampler);
if (result != MA_SUCCESS) {
return 0;
}
frameCountOut = ma_resampler_get_expected_output_frame_count(&resampler, frameCountIn);
preliminaryInputFrameCountFromFrac = (outputFrameCount * (sampleRateIn / sampleRateOut)) / sampleRateOut;
preliminaryInputFrameCount = (outputFrameCount * (sampleRateIn % sampleRateOut)) + preliminaryInputFrameCountFromFrac;
ma_resampler_uninit(&resampler, NULL);
if (preliminaryInputFrameCount <= frameCountIn) {
return frameCountOut;
outputFrameCount += 1;
}
return outputFrameCount;
}
}
#ifndef MA_DATA_CONVERTER_STACK_BUFFER_SIZE
#ifndef MA_DATA_CONVERTER_STACK_BUFFER_SIZE
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