1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Squash #1685, #1282, #1547: Support ARM platform. 5.0.5

This commit is contained in:
winlin 2021-06-22 07:49:48 +08:00
parent efdbf37255
commit a594678e3d
285 changed files with 12724 additions and 1671 deletions

View file

@ -652,7 +652,7 @@ void ff_ac3_process_exponents(AC3EncodeContext *s)
*/
static void count_frame_bits_fixed(AC3EncodeContext *s)
{
static const uint8_t frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
static const int frame_bits_inc[8] = { 0, 0, 2, 2, 2, 4, 2, 4 };
int blk;
int frame_bits;
@ -1065,7 +1065,7 @@ static int bit_alloc(AC3EncodeContext *s, int snr_offset)
{
int blk, ch;
snr_offset = (snr_offset - 240) << 2;
snr_offset = (snr_offset - 240) * 4;
reset_block_bap(s);
for (blk = 0; blk < s->num_blocks; blk++) {
@ -1800,7 +1800,7 @@ static int validate_float_option(float v, const float *v_list, int v_list_size)
break;
}
if (i == v_list_size)
return AVERROR(EINVAL);
return -1;
return i;
}