diff options
Diffstat (limited to 'opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src')
3 files changed, 7 insertions, 6 deletions
diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp index c06c24a..9f5525d 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/agc.cpp @@ -904,7 +904,7 @@ void agc2( { s = MAX_32; } - else if (s < (Word32) 0xFF000000L) + else if (s < (Word32) - 16777216) { s = MIN_32; } @@ -920,7 +920,7 @@ void agc2( { L_temp = MAX_32; } - else if (s < (Word32) 0xFFC00000L) + else if (s < (Word32) - 4194304) { L_temp = MIN_32; } @@ -940,7 +940,7 @@ void agc2( { sig_out[i] = MAX_16; } - else if (L_temp < (Word32) 0xF0000000L) + else if (L_temp < (Word32) - 268435456) { sig_out[i] = MIN_16; } diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp index 30631f4..22fe3b5 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/ph_disp.cpp @@ -625,7 +625,7 @@ void ph_disp( *pOverflow = 1; L_temp = MAX_32; } - else if (L_temp < (Word32) 0xe0000000L) + else if (L_temp < (Word32) - 536870912) { *pOverflow = 1; L_temp = MIN_32; diff --git a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp index 7bf5021..3e3f4e1 100644 --- a/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp +++ b/opencore/codecs_v2/audio/gsm_amr/amr_nb/dec/src/post_pro.cpp @@ -1,5 +1,5 @@ /* ------------------------------------------------------------------ - * Copyright (C) 1998-2009 PacketVideo + * Copyright (C) 1998-2010 PacketVideo * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -296,7 +296,8 @@ void Post_Process( L_tmp += ((Word32) st->x0) * c_b0; L_tmp += ((Word32) st->x1) * c_b1; L_tmp += ((Word32) x2) * c_b2; - L_tmp <<= 3; + + L_tmp = L_shl(L_tmp, 3, pOverflow); /* Multiplication by two of output speech with saturation. */ |