Loading lib_dec/ivas_init_dec_fx.c +467 −449 Original line number Diff line number Diff line Loading @@ -144,9 +144,11 @@ 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 ) ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -197,9 +199,11 @@ IF( is_DTXrate( ivas_total_brate ) == 0 ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -236,9 +240,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading @@ -262,9 +268,11 @@ move16(); 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -366,9 +374,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -400,9 +410,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -430,9 +442,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -473,9 +487,11 @@ IF( LT_32( ivas_total_brate, IVAS_24k4 ) ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -515,9 +531,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading
lib_dec/ivas_init_dec_fx.c +467 −449 Original line number Diff line number Diff line Loading @@ -144,9 +144,11 @@ 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 ) ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -197,9 +199,11 @@ IF( is_DTXrate( ivas_total_brate ) == 0 ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -236,9 +240,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, SBA_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading @@ -262,9 +268,11 @@ move16(); 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -366,9 +374,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -400,9 +410,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MASA_ISM_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -430,9 +442,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -473,9 +487,11 @@ IF( LT_32( ivas_total_brate, IVAS_24k4 ) ) } 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading Loading @@ -515,9 +531,11 @@ ELSE IF( EQ_32( st_ivas->ivas_format, MC_FORMAT ) ) 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 ) ) { #ifndef FIX_FLOAT_1539_G192_FORMAT_SWITCH IF( Opt_tsm ){ IF( Opt_tsm ) { #endif st_ivas->restartNeeded = 1; move16(); Loading