Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

recorder/pcm_record.c cleanup copy function

Browse source 
re: coverity
write_write_order: In long(*s++) + *s++,
s is written in *s++ and written in long(*s++)
but the order in which the side effects take place is undefined because
there is no intervening sequence point.

Change-Id: I2911c240f3e85fcfbf77297e8579e02e217c5af5
This commit is contained in:
William Wilgus 2021-08-08 23:02:51 -04:00 committed by William Wilgus
parent 2f0fd66e44
commit 4fb5aeb096
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/recorder/pcm_record.c
View file

@ -873,13 +873,17 @@ static bool open_rec_file(bool create)
static void * ICODE_ATTR
copy_buffer_mono_lr(void *dst, const void *src, size_t src_size)
{
int16_t *d = dst;
int16_t const *s = src;
/* mono = (L + R) / 2 */
int16_t *d = (int16_t*) dst;
int16_t const *s = (int16_t const*) src;
ssize_t copy_size = src_size;
/* mono = (L + R) / 2 */
do
*d++ = ((int32_t){ *s++ } + *s++ + 1) >> 1;
while (src_size -= PCM_SAMP_SIZE);
{
*d++ = ((int32_t){s[0]} + s[1] + 1) >> 1;
s+=2;
}
while ((copy_size -= PCM_SAMP_SIZE) > 0);
return dst;
}
@ -888,13 +892,13 @@ copy_buffer_mono_lr(void *dst, const void *src, size_t src_size)
static void * ICODE_ATTR
copy_buffer_mono_l(void *dst, const void *src, size_t src_size)
{
int16_t *d = dst;
int16_t const *s = (int16_t *)src - 2;
int16_t *d = (int16_t*)dst;
int16_t const *s = (int16_t const*)src - 2;
ssize_t copy_size = src_size;
/* mono = L */
do
*d++ = *(s += 2);
while (src_size -= PCM_SAMP_SIZE);
while ((copy_size -= PCM_SAMP_SIZE) > 0);
return dst;
}
@ -903,13 +907,13 @@ copy_buffer_mono_l(void *dst, const void *src, size_t src_size)
static void * ICODE_ATTR
copy_buffer_mono_r(void *dst, const void *src, size_t src_size)
{
int16_t *d = dst;
int16_t const *s = (int16_t *)src - 1;
int16_t *d = (int16_t*)dst;
int16_t const *s = (int16_t const*)src - 1;
ssize_t copy_size = src_size;
/* mono = R */
do
*d++ = *(s += 2);
while (src_size -= PCM_SAMP_SIZE);
while ((copy_size -= PCM_SAMP_SIZE) > 0);
return dst;
}