Commit 4189584d authored by vaclav's avatar vaclav
Browse files

fix

parent 03fee5fa

lib_dec/ivas_init_dec_fx.c

+7 −7
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static ivas_error doSanityChecks_IVAS( Decoder_Struct *st_ivas ); 


#ifdef NONBE_FIX_1052_SBA_EXT

#ifdef NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER

static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( const int16_t sba_order );

static AUDIO_CONFIG ivas_set_audio_config_from_sba_order( const Word16 sba_order );

#else

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_order );

#endif
@@ -71,7 +71,7 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_orde 


/*! r: audio configuration */

static AUDIO_CONFIG ivas_set_audio_config_from_sba_order(

    const int16_t sba_order /* i  : Ambisonic (SBA) order           */

    const Word16 sba_order /* i  : Ambisonic (SBA) order           */

)

#else

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_order )
@@ -113,7 +113,7 @@ static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const Word16 sba_orde 


#ifdef FIX_1209_SID_SIGNALING

/*---------------------------------------------------------------------*

 * ivas_dec_get_format_fx( )

 * ivas_dec_get_format( )

 *

 * Read main parameters from the bitstream to set-up the decoder:

 * - IVAS format
@@ -707,6 +707,7 @@ ivas_error ivas_dec_setup( 
                    st_ivas->nchan_ism = 1;

                    move16();

                }



                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/

#else

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */
@@ -764,8 +765,8 @@ ivas_error ivas_dec_setup( 
        {

            st_ivas->nchan_transport = 2; /* always 2 MASA transport channels */

            move16();

            /* for the DISC mode the number of objects are written at the end of the bitstream, in the MASA metadata */



            /* for the DISC mode the number of objects are written at the end of the bitstream, in the MASA metadata */

            Word32 res_dec, res_frac;

            iDiv_and_mod_32( ivas_total_brate, FRAMES_PER_SEC, &res_dec, &res_frac, 0 );

            st_ivas->nchan_ism = add( add( shl( st_ivas->bit_stream[res_dec - 1], 1 ), st_ivas->bit_stream[res_dec - 2] ), 1 );
@@ -812,8 +813,8 @@ ivas_error ivas_dec_setup( 
            {

                st_ivas->sba_order = st_ivas->bit_stream[num_bits_read + 1];

                move16();

                st_ivas->sba_order = shl( st_ivas->bit_stream[num_bits_read], 1 );

                num_bits_read += SBA_ORDER_BITS;

                st_ivas->sba_order = add( st_ivas->sba_order, shl( st_ivas->bit_stream[num_bits_read], 1 ) );

                num_bits_read = add( num_bits_read, SBA_ORDER_BITS );

            }



            test();
@@ -835,7 +836,6 @@ ivas_error ivas_dec_setup( 
                /*correct number of CPEs for discrete ISM coding*/

                test();

                IF( st_ivas->ini_frame > 0 && EQ_32( st_ivas->ism_mode, ISM_SBA_MODE_DISC ) )



#ifdef NONBE_FIX_ISM_XOVER_BR

                {

                    Word16 n;