Loading lib_dec/ivas_init_dec_fx.c +397 −417 Original line number Diff line number Diff line Loading @@ -145,11 +145,9 @@ ivas_error ivas_dec_get_format_fx( test(); IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->ivas_format, st_ivas->last_ivas_format ) && !( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_ISM_FORMAT ) ) && !( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_FORMAT ) ) ) { !( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_FORMAT ) ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -199,11 +197,9 @@ ivas_error ivas_dec_get_format_fx( } test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -239,11 +235,9 @@ ivas_error ivas_dec_get_format_fx( num_bits_read = add( num_bits_read, SBA_PLANAR_BITS ); test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_planar, st_ivas->sba_planar ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_planar, st_ivas->sba_planar ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading @@ -266,11 +260,9 @@ ivas_error ivas_dec_get_format_fx( sba_order = add( sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) ); test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -367,11 +359,9 @@ ivas_error ivas_dec_get_format_fx( #endif test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -402,11 +392,9 @@ ivas_error ivas_dec_get_format_fx( st_ivas->ism_mode = ivas_omasa_ism_mode_select_fx( ivas_total_brate, nchan_ism ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading @@ -433,11 +421,9 @@ ivas_error ivas_dec_get_format_fx( nchan_ism = add( add( shl( st_ivas->bit_stream[k - 1], 1 ), st_ivas->bit_stream[k - 2] ), 1 ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -477,11 +463,9 @@ ivas_error ivas_dec_get_format_fx( } test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -520,11 +504,9 @@ ivas_error ivas_dec_get_format_fx( signaled_config = ivas_mc_map_ls_setup_to_output_config_fx( idx ); test(); IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->transport_config, signaled_config ) ) { IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->transport_config, signaled_config ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -635,11 +617,9 @@ ivas_error ivas_dec_get_format_fx( k = sub( k, 1 ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading
lib_dec/ivas_init_dec_fx.c +397 −417 Original line number Diff line number Diff line Loading @@ -145,11 +145,9 @@ ivas_error ivas_dec_get_format_fx( test(); IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->ivas_format, st_ivas->last_ivas_format ) && !( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_ISM_FORMAT ) ) && !( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_FORMAT ) ) ) { !( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) && EQ_32( st_ivas->last_ivas_format, MASA_FORMAT ) ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -199,11 +197,9 @@ ivas_error ivas_dec_get_format_fx( } test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -239,11 +235,9 @@ ivas_error ivas_dec_get_format_fx( num_bits_read = add( num_bits_read, SBA_PLANAR_BITS ); test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_planar, st_ivas->sba_planar ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_planar, st_ivas->sba_planar ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading @@ -266,11 +260,9 @@ ivas_error ivas_dec_get_format_fx( sba_order = add( sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) ); test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -367,11 +359,9 @@ ivas_error ivas_dec_get_format_fx( #endif test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -402,11 +392,9 @@ ivas_error ivas_dec_get_format_fx( st_ivas->ism_mode = ivas_omasa_ism_mode_select_fx( ivas_total_brate, nchan_ism ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading @@ -433,11 +421,9 @@ ivas_error ivas_dec_get_format_fx( nchan_ism = add( add( shl( st_ivas->bit_stream[k - 1], 1 ), st_ivas->bit_stream[k - 2] ), 1 ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -477,11 +463,9 @@ ivas_error ivas_dec_get_format_fx( } test(); IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ) { IF( st_ivas->ini_frame > 0 && NE_16( sba_order, st_ivas->sba_order ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -520,11 +504,9 @@ ivas_error ivas_dec_get_format_fx( signaled_config = ivas_mc_map_ls_setup_to_output_config_fx( idx ); test(); IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->transport_config, signaled_config ) ) { IF( st_ivas->ini_frame > 0 && NE_32( st_ivas->transport_config, signaled_config ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading Loading @@ -635,11 +617,9 @@ ivas_error ivas_dec_get_format_fx( k = sub( k, 1 ); test(); IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ) { IF( st_ivas->ini_frame > 0 && NE_16( nchan_ism, st_ivas->nchan_ism ) ){ #ifdef DECODER_FORMAT_SWITCHING IF( isVoipMode ) { IF( isVoipMode ){ st_ivas->restartNeeded = 1; move16(); return IVAS_ERR_OK; Loading