geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: Fix static analysis concerns about a dead assignment.

Ryan C. Gordon 2017-01-24 10:09:29 -05:00
parent 073ff7dea3
commit 1da3a33773
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/audio/SDL_audiocvt.c
View File

@ -1147,7 +1147,7 @@ int
SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, const Uint32 _buflen) SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, const Uint32 _buflen)
{ {
int buflen = (int) _buflen; int buflen = (int) _buflen;
SDL_bool copied = SDL_FALSE; const void *origbuf = buf;
/* !!! FIXME: several converters can take advantage of SIMD, but only /* !!! FIXME: several converters can take advantage of SIMD, but only
!!! FIXME: if the data is aligned to 16 bytes. EnsureStreamBufferSize() !!! FIXME: if the data is aligned to 16 bytes. EnsureStreamBufferSize()
@ -1173,7 +1173,7 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, const Uint32 _bufle
if (workbuf == NULL) { if (workbuf == NULL) {
return -1; /* probably out of memory. */ return -1; /* probably out of memory. */
} }
copied = SDL_TRUE; SDL_assert(buf == origbuf);
SDL_memcpy(workbuf, buf, buflen); SDL_memcpy(workbuf, buf, buflen);
stream->cvt_before_resampling.buf = workbuf; stream->cvt_before_resampling.buf = workbuf;
stream->cvt_before_resampling.len = buflen; stream->cvt_before_resampling.len = buflen;
@ -1190,9 +1190,8 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, const Uint32 _bufle
if (workbuf == NULL) { if (workbuf == NULL) {
return -1; /* probably out of memory. */ return -1; /* probably out of memory. */
} }
if (!copied) { if (buf == origbuf) { /* copy if we haven't before. */
SDL_memcpy(workbuf, buf, buflen); SDL_memcpy(workbuf, buf, buflen);
copied = SDL_TRUE;
} }
buflen = stream->resampler_func(stream, workbuf, buflen, workbuf, workbuflen); buflen = stream->resampler_func(stream, workbuf, buflen, workbuf, workbuflen);
buf = workbuf; buf = workbuf;
@ -1204,11 +1203,9 @@ SDL_AudioStreamPut(SDL_AudioStream *stream, const void *buf, const Uint32 _bufle
if (workbuf == NULL) { if (workbuf == NULL) {
return -1; /* probably out of memory. */ return -1; /* probably out of memory. */
} }
if (!copied) { if (buf == origbuf) { /* copy if we haven't before. */
SDL_memcpy(workbuf, buf, buflen); SDL_memcpy(workbuf, buf, buflen);
copied = SDL_TRUE;
} }
stream->cvt_after_resampling.buf = workbuf; stream->cvt_after_resampling.buf = workbuf;
stream->cvt_after_resampling.len = buflen; stream->cvt_after_resampling.len = buflen;
if (SDL_ConvertAudio(&stream->cvt_after_resampling) == -1) { if (SDL_ConvertAudio(&stream->cvt_after_resampling) == -1) {