mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-15 23:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove frame limit from audio batch callback (#13333)

Browse Source
This commit is contained in:
jdgleaver 2021-12-06 17:11:46 +00:00 committed by GitHub
parent e954a46b1b
commit e3217b4a35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
audio/audio_driver.c
View File

@ -818,38 +818,53 @@ void audio_driver_sample(int16_t left, int16_t right)
size_t audio_driver_sample_batch(const int16_t *data, size_t frames) size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
{ {
recording_state_t *record_st = recording_state_get_ptr(); size_t frames_remaining = frames;
runloop_state_t *runloop_st = runloop_state_get_ptr(); recording_state_t *record_st = recording_state_get_ptr();
audio_driver_state_t *audio_st = &audio_driver_st; runloop_state_t *runloop_st = runloop_state_get_ptr();
audio_driver_state_t *audio_st = &audio_driver_st;
if (frames > (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1)) if (audio_st->suspended || (frames < 1))
frames = AUDIO_CHUNK_SIZE_NONBLOCKING >> 1;
if (audio_st->suspended)
return frames; return frames;
if ( record_st->data /* We want to run this loop at least once, so use a
&& record_st->driver * do...while (do...while has only a single conditional
&& record_st->driver->push_audio) * jump, as opposed to for and while which have a
* conditional jump and an unconditional jump). Note,
* however, that this is only relevant for compilers
* that are poor at optimisation... */
do
{ {
struct record_audio_data ffemu_data; size_t frames_to_write =
(frames_remaining > (AUDIO_CHUNK_SIZE_NONBLOCKING >> 1)) ?
(AUDIO_CHUNK_SIZE_NONBLOCKING >> 1) : frames_remaining;
ffemu_data.data = data; if ( record_st->data
ffemu_data.frames = (frames << 1) / 2; && record_st->driver
&& record_st->driver->push_audio)
{
struct record_audio_data ffemu_data;
record_st->driver->push_audio(record_st->data, &ffemu_data); ffemu_data.data = data;
ffemu_data.frames = frames_to_write;
record_st->driver->push_audio(record_st->data, &ffemu_data);
}
if (!( runloop_st->paused
|| !audio_st->active
|| !audio_st->output_samples_buf))
audio_driver_flush(audio_st,
config_get_ptr()->floats.slowmotion_ratio,
config_get_ptr()->bools.audio_fastforward_mute,
data,
frames_to_write << 1,
runloop_st->slowmotion,
runloop_st->fastmotion);
frames_remaining -= frames_to_write;
data += frames_to_write << 1;
} }
while (frames_remaining > 0);
if (!(
runloop_st->paused
|| !audio_st->active
|| !audio_st->output_samples_buf))
audio_driver_flush(audio_st,
config_get_ptr()->floats.slowmotion_ratio,
config_get_ptr()->bools.audio_fastforward_mute,
data,
frames << 1,
runloop_st->slowmotion,
runloop_st->fastmotion);
return frames; return frames;
} }
@ -874,8 +889,10 @@ size_t audio_driver_sample_batch_rewind(
for (i = 0; i < samples; i++) for (i = 0; i < samples; i++)
{ {
if (audio_st->rewind_ptr > 0) if (audio_st->rewind_ptr < 1)
audio_st->rewind_buf[--audio_st->rewind_ptr] = data[i]; break;
audio_st->rewind_buf[--audio_st->rewind_ptr] = data[i];
} }
return frames; return frames;

6
audio/audio_driver.h
View File

@ -374,8 +374,7 @@ void audio_driver_sample(int16_t left, int16_t right);
* *
* Batched audio sample render callback function. * Batched audio sample render callback function.
* *
* Returns: amount of frames sampled. Will be equal to @frames * Returns: amount of frames sampled.
* unless @frames exceeds (AUDIO_CHUNK_SIZE_NONBLOCKING / 2).
**/ **/
size_t audio_driver_sample_batch(const int16_t *data, size_t frames); size_t audio_driver_sample_batch(const int16_t *data, size_t frames);
@ -401,8 +400,7 @@ void audio_driver_sample_rewind(int16_t left, int16_t right);
* This callback function will be used instead of * This callback function will be used instead of
* audio_driver_sample_batch when rewinding is activated. * audio_driver_sample_batch when rewinding is activated.
* *
* Returns: amount of frames sampled. Will be equal to @frames * Returns: amount of frames sampled.
* unless @frames exceeds (AUDIO_CHUNK_SIZE_NONBLOCKING / 2).
**/ **/
size_t audio_driver_sample_batch_rewind( size_t audio_driver_sample_batch_rewind(
const int16_t *data, size_t frames); const int16_t *data, size_t frames);