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
4241b9f6
Commit
4241b9f6
authored
Jan 26, 2020
by
David Reid
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add ma_linear_resampler_set_rate_ratio().
parent
ed6ad79e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
37 additions
and
11 deletions
+37
-11
research/ma_resampler.h
research/ma_resampler.h
+37
-11
No files found.
research/ma_resampler.h
View file @
4241b9f6
...
@@ -170,6 +170,7 @@ ma_result ma_linear_resampler_init(const ma_linear_resampler_config* pConfig, ma
...
@@ -170,6 +170,7 @@ ma_result ma_linear_resampler_init(const ma_linear_resampler_config* pConfig, ma
void
ma_linear_resampler_uninit
(
ma_linear_resampler
*
pResampler
);
void
ma_linear_resampler_uninit
(
ma_linear_resampler
*
pResampler
);
ma_result
ma_linear_resampler_process_pcm_frames
(
ma_linear_resampler
*
pResampler
,
const
void
*
pFramesIn
,
ma_uint64
*
pFrameCountIn
,
void
*
pFramesOut
,
ma_uint64
*
pFrameCountOut
);
ma_result
ma_linear_resampler_process_pcm_frames
(
ma_linear_resampler
*
pResampler
,
const
void
*
pFramesIn
,
ma_uint64
*
pFrameCountIn
,
void
*
pFramesOut
,
ma_uint64
*
pFrameCountOut
);
ma_result
ma_linear_resampler_set_rate
(
ma_linear_resampler
*
pResampler
,
ma_uint32
sampleRateIn
,
ma_uint32
sampleRateOut
);
ma_result
ma_linear_resampler_set_rate
(
ma_linear_resampler
*
pResampler
,
ma_uint32
sampleRateIn
,
ma_uint32
sampleRateOut
);
ma_result
ma_linear_resampler_set_rate_ratio
(
ma_linear_resampler
*
pResampler
,
float
ratioInOut
);
ma_uint64
ma_linear_resampler_get_required_input_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
outputFrameCount
);
ma_uint64
ma_linear_resampler_get_required_input_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
outputFrameCount
);
ma_uint64
ma_linear_resampler_get_expected_output_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
inputFrameCount
);
ma_uint64
ma_linear_resampler_get_expected_output_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
inputFrameCount
);
ma_uint64
ma_linear_resampler_get_input_latency
(
ma_linear_resampler
*
pResampler
);
ma_uint64
ma_linear_resampler_get_input_latency
(
ma_linear_resampler
*
pResampler
);
...
@@ -839,6 +840,23 @@ ma_result ma_linear_resampler_set_rate(ma_linear_resampler* pResampler, ma_uint3
...
@@ -839,6 +840,23 @@ ma_result ma_linear_resampler_set_rate(ma_linear_resampler* pResampler, ma_uint3
return
ma_linear_resampler_set_rate_internal
(
pResampler
,
sampleRateIn
,
sampleRateOut
,
/* isResamplerAlreadyInitialized = */
MA_TRUE
);
return
ma_linear_resampler_set_rate_internal
(
pResampler
,
sampleRateIn
,
sampleRateOut
,
/* isResamplerAlreadyInitialized = */
MA_TRUE
);
}
}
ma_result
ma_linear_resampler_set_rate_ratio
(
ma_linear_resampler
*
pResampler
,
float
ratioInOut
)
{
ma_uint32
n
;
ma_uint32
d
;
d
=
1000000
;
/* We use up to 6 decimal places. */
n
=
(
ma_uint32
)(
ratioInOut
*
d
);
if
(
n
==
0
)
{
return
MA_INVALID_ARGS
;
/* Ratio too small. */
}
MA_ASSERT
(
n
!=
0
);
return
ma_linear_resampler_set_rate
(
pResampler
,
n
,
d
);
}
ma_uint64
ma_linear_resampler_get_required_input_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
outputFrameCount
)
ma_uint64
ma_linear_resampler_get_required_input_frame_count
(
ma_linear_resampler
*
pResampler
,
ma_uint64
outputFrameCount
)
{
{
...
@@ -1225,7 +1243,7 @@ static ma_result ma_resampler_process_pcm_frames__seek__linear(ma_resampler* pRe
...
@@ -1225,7 +1243,7 @@ static ma_result ma_resampler_process_pcm_frames__seek__linear(ma_resampler* pRe
MA_ASSERT
(
pResampler
!=
NULL
);
MA_ASSERT
(
pResampler
!=
NULL
);
/* Seeking is supported natively by the linear resampler. */
/* Seeking is supported natively by the linear resampler. */
return
ma_linear_resampler_process_pcm_frames
(
pResample
r
,
pFramesIn
,
pFrameCountIn
,
NULL
,
pFrameCountOut
);
return
ma_linear_resampler_process_pcm_frames
(
&
pResampler
->
state
.
linea
r
,
pFramesIn
,
pFrameCountIn
,
NULL
,
pFrameCountOut
);
}
}
#if defined(MA_HAS_SPEEX_RESAMPLER)
#if defined(MA_HAS_SPEEX_RESAMPLER)
...
@@ -1324,11 +1342,18 @@ ma_result ma_resampler_set_rate(ma_resampler* pResampler, ma_uint32 sampleRateIn
...
@@ -1324,11 +1342,18 @@ ma_result ma_resampler_set_rate(ma_resampler* pResampler, ma_uint32 sampleRateIn
ma_result
ma_resampler_set_rate_ratio
(
ma_resampler
*
pResampler
,
float
ratio
)
ma_result
ma_resampler_set_rate_ratio
(
ma_resampler
*
pResampler
,
float
ratio
)
{
{
/* We use up to 6 decimal places. */
if
(
pResampler
==
NULL
)
{
return
MA_INVALID_ARGS
;
}
if
(
pResampler
->
config
.
algorithm
==
ma_resample_algorithm_linear
)
{
return
ma_linear_resampler_set_rate_ratio
(
&
pResampler
->
state
.
linear
,
ratio
);
}
else
{
/* Getting here means the backend does not have native support for setting the rate as a ratio so we just do it generically. */
ma_uint32
n
;
ma_uint32
n
;
ma_uint32
d
;
ma_uint32
d
;
d
=
1000000
;
d
=
1000000
;
/* We use up to 6 decimal places. */
n
=
(
ma_uint32
)(
ratio
*
d
);
n
=
(
ma_uint32
)(
ratio
*
d
);
if
(
n
==
0
)
{
if
(
n
==
0
)
{
...
@@ -1338,6 +1363,7 @@ ma_result ma_resampler_set_rate_ratio(ma_resampler* pResampler, float ratio)
...
@@ -1338,6 +1363,7 @@ ma_result ma_resampler_set_rate_ratio(ma_resampler* pResampler, float ratio)
MA_ASSERT
(
n
!=
0
);
MA_ASSERT
(
n
!=
0
);
return
ma_resampler_set_rate
(
pResampler
,
n
,
d
);
return
ma_resampler_set_rate
(
pResampler
,
n
,
d
);
}
}
}
ma_uint64
ma_resampler_get_required_input_frame_count
(
ma_resampler
*
pResampler
,
ma_uint64
outputFrameCount
)
ma_uint64
ma_resampler_get_required_input_frame_count
(
ma_resampler
*
pResampler
,
ma_uint64
outputFrameCount
)
...
...
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