Loading lib_dec/ivas_mc_paramupmix_dec.c +3 −7 Original line number Diff line number Diff line Loading @@ -124,12 +124,8 @@ void ivas_mc_paramupmix_dec_read_BS( bit_stream_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; move16(); 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 ) ); 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 @@ -235,7 +231,7 @@ void ivas_mc_paramupmix_dec_render( move16(); /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ slots_to_render = s_min( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), idiv1616( nSamplesAsked, slot_size ) ); slots_to_render = s_min( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), nSamplesAsked / slot_size ); *nSamplesRendered = imult1616( slots_to_render, (Word16) slot_size ); first_sf = st_ivas->hTcBuffer->subframes_rendered; move16(); Loading Loading
lib_dec/ivas_mc_paramupmix_dec.c +3 −7 Original line number Diff line number Diff line Loading @@ -124,12 +124,8 @@ void ivas_mc_paramupmix_dec_read_BS( bit_stream_orig = st0->bit_stream; next_bit_pos_orig = st0->next_bit_pos; move16(); 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 ) ); 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 @@ -235,7 +231,7 @@ void ivas_mc_paramupmix_dec_render( move16(); /* loop for synthesis, assume we always have to render in multiples of 5ms subframes with spills */ slots_to_render = s_min( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), idiv1616( nSamplesAsked, slot_size ) ); slots_to_render = s_min( sub( st_ivas->hTcBuffer->num_slots, st_ivas->hTcBuffer->slots_rendered ), nSamplesAsked / slot_size ); *nSamplesRendered = imult1616( slots_to_render, (Word16) slot_size ); first_sf = st_ivas->hTcBuffer->subframes_rendered; move16(); Loading