Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve some checks for compiler analysis

Browse Source
This commit is contained in:
Chris Robinson
2018-12-02 15:29:26 -08:00
parent 60254488e9
commit 45b65366bb
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Alc/mixvoice.cpp
+2 -1
View File
@@ -482,7 +482,8 @@ ALboolean MixSource(ALvoice *voice, ALuint SourceID, ALCcontext *Context, ALsize
ALsizei CompLen{0};
auto load_buffer = [pos,&SrcData,NumChannels,SampleSize,chan,FilledAmt,SizeToDo,&CompLen](const ALbuffer *buffer) -> void
{
ALsizei DataSize{buffer ? buffer->SampleLen : 0};
if(!buffer) return;
ALsizei DataSize{buffer->SampleLen};
if(pos >= DataSize) return;
DataSize = mini(SizeToDo, DataSize - pos);
OpenAL32/alAuxEffectSlot.cpp
+1
View File
@@ -577,6 +577,7 @@ void EffectState::DecRef() noexcept
ALenum InitEffectSlot(ALeffectslot *slot)
{
EffectStateFactory *factory{getFactoryByType(slot->Effect.Type)};
if(!factory) return AL_INVALID_VALUE;
slot->Effect.State = factory->create();
if(!slot->Effect.State) return AL_OUT_OF_MEMORY;
OpenAL32/alSource.cpp
+9 -9
View File
@@ -2977,11 +2977,11 @@ AL_API ALvoid AL_APIENTRY alSourceQueueBuffers(ALuint src, ALsizei nb, const ALu
std::lock_guard<std::mutex> _{context->SourceLock};
ALsource *source{LookupSource(context.get(),src)};
if(!source)
if(UNLIKELY(!source))
SETERR_RETURN(context.get(), AL_INVALID_NAME,, "Invalid source ID %u", src);
/* Can't queue on a Static Source */
if(source->SourceType == AL_STATIC)
if(UNLIKELY(source->SourceType == AL_STATIC))
SETERR_RETURN(context.get(), AL_INVALID_OPERATION,, "Queueing onto static source %u", src);
/* Check for a valid Buffer, for its frequency and format */
@@ -3094,11 +3094,11 @@ AL_API void AL_APIENTRY alSourceQueueBufferLayersSOFT(ALuint src, ALsizei nb, co
std::lock_guard<std::mutex> _{context->SourceLock};
ALsource *source{LookupSource(context.get(),src)};
if(!source)
if(UNLIKELY(!source))
SETERR_RETURN(context.get(), AL_INVALID_NAME,, "Invalid source ID %u", src);
/* Can't queue on a Static Source */
if(source->SourceType == AL_STATIC)
if(UNLIKELY(source->SourceType == AL_STATIC))
SETERR_RETURN(context.get(), AL_INVALID_OPERATION,, "Queueing onto static source %u", src);
/* Check for a valid Buffer, for its frequency and format */
@@ -3202,12 +3202,12 @@ AL_API ALvoid AL_APIENTRY alSourceUnqueueBuffers(ALuint src, ALsizei nb, ALuint
std::lock_guard<std::mutex> _{context->SourceLock};
ALsource *source{LookupSource(context.get(),src)};
if(!source)
if(UNLIKELY(!source))
SETERR_RETURN(context.get(), AL_INVALID_NAME,, "Invalid source ID %u", src);
if(source->Looping)
if(UNLIKELY(source->Looping))
SETERR_RETURN(context.get(), AL_INVALID_VALUE,, "Unqueueing from looping source %u", src);
if(source->SourceType != AL_STREAMING)
if(UNLIKELY(source->SourceType != AL_STREAMING))
SETERR_RETURN(context.get(), AL_INVALID_VALUE,,
"Unqueueing from a non-streaming source %u", src);
@@ -3219,7 +3219,7 @@ AL_API ALvoid AL_APIENTRY alSourceUnqueueBuffers(ALuint src, ALsizei nb, ALuint
Current = voice->current_buffer.load(std::memory_order_relaxed);
else if(source->state == AL_INITIAL)
Current = BufferList;
if(BufferList == Current)
if(UNLIKELY(BufferList == Current))
SETERR_RETURN(context.get(), AL_INVALID_VALUE,, "Unqueueing pending buffers");
ALsizei i{BufferList->num_buffers};
@@ -3229,7 +3229,7 @@ AL_API ALvoid AL_APIENTRY alSourceUnqueueBuffers(ALuint src, ALsizei nb, ALuint
* trying to unqueue pending buffers.
*/
ALbufferlistitem *next{BufferList->next.load(std::memory_order_relaxed)};
if(!next || next == Current)
if(UNLIKELY(!next) || UNLIKELY(next == Current))
SETERR_RETURN(context.get(), AL_INVALID_VALUE,, "Unqueueing pending buffers");
BufferList = next;