audio: Added SDL_GetAudioStreamQueued
This commit is contained in:
@@ -657,9 +657,12 @@ int SDL_PutAudioStreamData(SDL_AudioStream *stream, const void *buf, int len)
|
||||
retval = SDL_WriteToAudioQueue(stream->queue, &stream->src_spec, buf, len);
|
||||
}
|
||||
|
||||
if ((retval == 0) && stream->put_callback) {
|
||||
const int newavail = SDL_GetAudioStreamAvailable(stream) - prev_available;
|
||||
stream->put_callback(stream->put_callback_userdata, stream, newavail, newavail);
|
||||
if (retval == 0) {
|
||||
stream->total_frames_queued += len / SDL_AUDIO_FRAMESIZE(stream->src_spec);
|
||||
if (stream->put_callback) {
|
||||
const int newavail = SDL_GetAudioStreamAvailable(stream) - prev_available;
|
||||
stream->put_callback(stream->put_callback_userdata, stream, newavail, newavail);
|
||||
}
|
||||
}
|
||||
|
||||
SDL_UnlockMutex(stream->lock);
|
||||
@@ -858,6 +861,8 @@ static int GetAudioStreamDataInternal(SDL_AudioStream *stream, void *buf, int ou
|
||||
SDL_assert(!"Not enough data in queue (read)");
|
||||
}
|
||||
|
||||
stream->total_frames_queued -= output_frames;
|
||||
|
||||
// Even if we aren't currently resampling, we always need to update the history buffer
|
||||
UpdateAudioStreamHistoryBuffer(stream, input_buffer, input_bytes, NULL, 0);
|
||||
|
||||
@@ -946,6 +951,7 @@ static int GetAudioStreamDataInternal(SDL_AudioStream *stream, void *buf, int ou
|
||||
if (SDL_ReadFromAudioQueue(stream->queue, input_buffer, input_bytes) != 0) {
|
||||
SDL_assert(!"Not enough data in queue (resample read)");
|
||||
}
|
||||
stream->total_frames_queued -= input_frames;
|
||||
|
||||
// Update the history buffer and fill in the left padding
|
||||
UpdateAudioStreamHistoryBuffer(stream, input_buffer, input_bytes, left_padding, padding_bytes);
|
||||
@@ -1083,7 +1089,7 @@ int SDL_GetAudioStreamData(SDL_AudioStream *stream, void *voidbuf, int len)
|
||||
return total;
|
||||
}
|
||||
|
||||
// number of converted/resampled bytes available
|
||||
// number of converted/resampled bytes available for output
|
||||
int SDL_GetAudioStreamAvailable(SDL_AudioStream *stream)
|
||||
{
|
||||
if (!stream) {
|
||||
@@ -1108,6 +1114,21 @@ int SDL_GetAudioStreamAvailable(SDL_AudioStream *stream)
|
||||
return (int) SDL_min(count, SDL_INT_MAX);
|
||||
}
|
||||
|
||||
// number of sample frames that are currently queued as input.
|
||||
int SDL_GetAudioStreamQueued(SDL_AudioStream *stream)
|
||||
{
|
||||
if (!stream) {
|
||||
return SDL_InvalidParamError("stream");
|
||||
}
|
||||
|
||||
SDL_LockMutex(stream->lock);
|
||||
const Uint64 total = stream->total_frames_queued;
|
||||
SDL_UnlockMutex(stream->lock);
|
||||
|
||||
// if this overflows an int, just clamp it to a maximum.
|
||||
return (int) SDL_min(total, SDL_INT_MAX);
|
||||
}
|
||||
|
||||
int SDL_ClearAudioStream(SDL_AudioStream *stream)
|
||||
{
|
||||
if (stream == NULL) {
|
||||
@@ -1119,6 +1140,7 @@ int SDL_ClearAudioStream(SDL_AudioStream *stream)
|
||||
SDL_ClearAudioQueue(stream->queue);
|
||||
SDL_zero(stream->input_spec);
|
||||
stream->resample_offset = 0;
|
||||
stream->total_frames_queued = 0;
|
||||
|
||||
SDL_UnlockMutex(stream->lock);
|
||||
return 0;
|
||||
|
||||
@@ -175,6 +175,7 @@ struct SDL_AudioStream
|
||||
float freq_ratio;
|
||||
|
||||
struct SDL_AudioQueue* queue;
|
||||
Uint64 total_frames_queued;
|
||||
|
||||
SDL_AudioSpec input_spec; // The spec of input data currently being processed
|
||||
Sint64 resample_offset;
|
||||
|
||||
@@ -906,6 +906,7 @@ SDL3_0.0.0 {
|
||||
SDL_GetAudioStreamFrequencyRatio;
|
||||
SDL_SetAudioStreamFrequencyRatio;
|
||||
SDL_SetAudioPostmixCallback;
|
||||
SDL_GetAudioStreamQueued;
|
||||
# extra symbols go here (don't modify this line)
|
||||
local: *;
|
||||
};
|
||||
|
||||
@@ -931,3 +931,4 @@
|
||||
#define SDL_GetAudioStreamFrequencyRatio SDL_GetAudioStreamFrequencyRatio_REAL
|
||||
#define SDL_SetAudioStreamFrequencyRatio SDL_SetAudioStreamFrequencyRatio_REAL
|
||||
#define SDL_SetAudioPostmixCallback SDL_SetAudioPostmixCallback_REAL
|
||||
#define SDL_GetAudioStreamQueued SDL_GetAudioStreamQueued_REAL
|
||||
|
||||
@@ -977,3 +977,4 @@ SDL_DYNAPI_PROC(int,SDL_SetWindowFocusable,(SDL_Window *a, SDL_bool b),(a,b),ret
|
||||
SDL_DYNAPI_PROC(float,SDL_GetAudioStreamFrequencyRatio,(SDL_AudioStream *a),(a),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_SetAudioStreamFrequencyRatio,(SDL_AudioStream *a, float b),(a,b),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_SetAudioPostmixCallback,(SDL_AudioDeviceID a, SDL_AudioPostmixCallback b, void *c),(a,b,c),return)
|
||||
SDL_DYNAPI_PROC(int,SDL_GetAudioStreamQueued,(SDL_AudioStream *a),(a),return)
|
||||
|
||||
Reference in New Issue
Block a user