#include "libavutil/channel_layout.h"
#include "libavutil/intreadwrite.h"
+#include "libavutil/mem_internal.h"
+
#include "avcodec.h"
#include "bswapdsp.h"
#include "get_bits.h"
if(i > 0){
memcpy(tmp, dec->cvector, i * sizeof(*tmp));
for(j = 0; j < i; j++)
- dec->cvector[j] = ((tmp[i - j - 1] * dec->vector[i]) +
- (dec->cvector[j] << 15) + 0x4000) >> 15;
+ dec->cvector[j] += (tmp[i - j - 1] * dec->vector[i] + 0x4000) >> 15;
}
dec->cvector[i] = (8 - dec->vector[i]) >> 3;
}
for(i = 0; i < 60; i++){
int sum = 0;
for(k = 0; k < 8; k++)
- sum += ptr0[k] * ptr1[k];
- sum = (sum + (out[i] << 12) + 0x800) >> 12;
+ sum += ptr0[k] * (unsigned)ptr1[k];
+ sum = out[i] + ((int)(sum + 0x800U) >> 12);
out[i] = av_clip(sum, -0x7FFE, 0x7FFE);
for(k = 7; k > 0; k--)
ptr0[k] = ptr0[k - 1];
for(k = 7; k > 0; k--)
ptr0[k] = ptr0[k - 1];
ptr0[0] = out[i];
- out[i] = ((out[i] << 12) - sum) >> 12;
+ out[i] += (- sum) >> 12;
}
for(i = 0; i < 8; i++)
ptr0 = dec->tmp3;
for(i = 0; i < 60; i++){
- int sum = out[i] << 12;
+ int sum = out[i] * (1 << 12);
for(k = 0; k < 8; k++)
sum += ptr0[k] * t[k];
for(k = 7; k > 0; k--)
return buf_size;
}
-AVCodec ff_truespeech_decoder = {
+const AVCodec ff_truespeech_decoder = {
.name = "truespeech",
.long_name = NULL_IF_CONFIG_SMALL("DSP Group TrueSpeech"),
.type = AVMEDIA_TYPE_AUDIO,