Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
6bf137a0
There was an error fetching the commit references. Please try again later.
Commit
6bf137a0
authored
5 years ago
by
Fernando Sahmkow
Browse files
Options
Downloads
Patches
Plain Diff
AudioCore: Use nanoseconds instead of cycles for buffer time.
parent
dc580582
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/audio_core/stream.cpp
+5
-5
5 additions, 5 deletions
src/audio_core/stream.cpp
src/audio_core/stream.h
+1
-1
1 addition, 1 deletion
src/audio_core/stream.h
with
6 additions
and
6 deletions
src/audio_core/stream.cpp
+
5
−
5
View file @
6bf137a0
...
...
@@ -59,11 +59,11 @@ Stream::State Stream::GetState() const {
return
state
;
}
s64
Stream
::
GetBufferRelease
Cycles
(
const
Buffer
&
buffer
)
const
{
s64
Stream
::
GetBufferRelease
NS
(
const
Buffer
&
buffer
)
const
{
const
std
::
size_t
num_samples
{
buffer
.
GetSamples
().
size
()
/
GetNumChannels
()};
const
auto
u
s
=
std
::
chrono
::
micr
oseconds
((
static_cast
<
u64
>
(
num_samples
)
*
1000000
)
/
sample_rate
);
return
Core
::
Timing
::
usToCycles
(
us
);
const
auto
n
s
=
std
::
chrono
::
nan
oseconds
((
static_cast
<
u64
>
(
num_samples
)
*
1000000
000ULL
)
/
sample_rate
);
return
ns
.
count
(
);
}
static
void
VolumeAdjustSamples
(
std
::
vector
<
s16
>&
samples
,
float
game_volume
)
{
...
...
@@ -105,7 +105,7 @@ void Stream::PlayNextBuffer() {
sink_stream
.
EnqueueSamples
(
GetNumChannels
(),
active_buffer
->
GetSamples
());
core_timing
.
ScheduleEvent
(
GetBufferRelease
Cycles
(
*
active_buffer
),
release_event
,
{});
core_timing
.
ScheduleEvent
(
GetBufferRelease
NS
(
*
active_buffer
),
release_event
,
{});
}
void
Stream
::
ReleaseActiveBuffer
()
{
...
...
This diff is collapsed.
Click to expand it.
src/audio_core/stream.h
+
1
−
1
View file @
6bf137a0
...
...
@@ -96,7 +96,7 @@ private:
void
ReleaseActiveBuffer
();
/// Gets the number of core cycles when the specified buffer will be released
s64
GetBufferRelease
Cycles
(
const
Buffer
&
buffer
)
const
;
s64
GetBufferRelease
NS
(
const
Buffer
&
buffer
)
const
;
u32
sample_rate
;
///< Sample rate of the stream
Format
format
;
///< Format of the stream
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment