Loading lib_dec/ivas_mc_paramupmix_dec.c +7 −6 Original line number Diff line number Diff line Loading @@ -124,8 +124,12 @@ void ivas_mc_paramupmix_dec_read_BS( bit_stream_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; move16(); Word32 L_temp = Mpy_32_32( st_ivas->hDecoderConfig->ivas_total_brate, ONE_BY_FRAMES_PER_SEC ); last_bit_pos = extract_l( L_sub( L_temp, 1 ) ); Word16 temp_e; Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( st_ivas->hDecoderConfig->ivas_total_brate, FRAMES_PER_SEC, &temp_e ); L_temp = L_shr( L_temp, sub( 31, temp_e ) ); last_bit_pos = (Word16) L_sub( L_temp, 1 ); // Word32 L_temp = Mpy_32_32( st_ivas->hDecoderConfig->ivas_total_brate, ONE_BY_FRAMES_PER_SEC ); // last_bit_pos = extract_l( L_sub( L_temp, 1 ) ); nb_bits_read_orig = 0; move16(); last_bit_pos = sub( last_bit_pos, nb_bits_read_orig ); /* reverse the bitstream for easier reading of indices */ Loading Loading @@ -544,10 +548,7 @@ static void ivas_param_upmix_dec_decorr_subframes( push_wmops( "ivas_param_upmix_dec_decorr_subframes" ); /* TD decorrelator */ Word16 temp_e; default_frame = BASOP_Util_Divide3232_Scale( st_ivas->hDecoderConfig->output_Fs, FRAMES_PER_SEC, &temp_e ); default_frame = shr( default_frame, sub( 15, temp_e ) ); //default_frame = extract_l( Mpy_32_32( st_ivas->hDecoderConfig->output_Fs, ONE_BY_FRAMES_PER_SEC ) ); default_frame = extract_l( Mpy_32_32( st_ivas->hDecoderConfig->output_Fs, ONE_BY_FRAMES_PER_SEC ) ); nSamplesLeftForTD = nSamplesForRendering; move16(); nchan_internal = MC_PARAMUPMIX_COMBINATIONS; Loading Loading
lib_dec/ivas_mc_paramupmix_dec.c +7 −6 Original line number Diff line number Diff line Loading @@ -124,8 +124,12 @@ void ivas_mc_paramupmix_dec_read_BS( bit_stream_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; move16(); Word32 L_temp = Mpy_32_32( st_ivas->hDecoderConfig->ivas_total_brate, ONE_BY_FRAMES_PER_SEC ); last_bit_pos = extract_l( L_sub( L_temp, 1 ) ); Word16 temp_e; Word32 L_temp = BASOP_Util_Divide3232_Scale_cadence( st_ivas->hDecoderConfig->ivas_total_brate, FRAMES_PER_SEC, &temp_e ); L_temp = L_shr( L_temp, sub( 31, temp_e ) ); last_bit_pos = (Word16) L_sub( L_temp, 1 ); // Word32 L_temp = Mpy_32_32( st_ivas->hDecoderConfig->ivas_total_brate, ONE_BY_FRAMES_PER_SEC ); // last_bit_pos = extract_l( L_sub( L_temp, 1 ) ); nb_bits_read_orig = 0; move16(); last_bit_pos = sub( last_bit_pos, nb_bits_read_orig ); /* reverse the bitstream for easier reading of indices */ Loading Loading @@ -544,10 +548,7 @@ static void ivas_param_upmix_dec_decorr_subframes( push_wmops( "ivas_param_upmix_dec_decorr_subframes" ); /* TD decorrelator */ Word16 temp_e; default_frame = BASOP_Util_Divide3232_Scale( st_ivas->hDecoderConfig->output_Fs, FRAMES_PER_SEC, &temp_e ); default_frame = shr( default_frame, sub( 15, temp_e ) ); //default_frame = extract_l( Mpy_32_32( st_ivas->hDecoderConfig->output_Fs, ONE_BY_FRAMES_PER_SEC ) ); default_frame = extract_l( Mpy_32_32( st_ivas->hDecoderConfig->output_Fs, ONE_BY_FRAMES_PER_SEC ) ); nSamplesLeftForTD = nSamplesForRendering; move16(); nchan_internal = MC_PARAMUPMIX_COMBINATIONS; Loading