Commit 66053402 authored by vaclav's avatar vaclav
Browse files

fix

parent 4a0671fd

lib_dec/ivas_init_dec.c

+17 −16
Original line number Diff line number Diff line
@@ -106,11 +106,11 @@ ivas_error ivas_dec_get_format( 
    int16_t nchan_ism, element_mode_flag;

    int16_t sba_order, sba_planar, sba_analysis_order;

    int32_t ivas_total_brate;

    uint16_t *bit_stream_orig;

    AUDIO_CONFIG signaled_config;

#ifdef DECODER_FORMAT_SWITCHING

    int16_t isVoipMode;

    int16_t Opt_tsm;

#endif

    uint16_t *bit_stream_orig;

    AUDIO_CONFIG signaled_config;

    ivas_error error;



    num_bits_read = 0;
@@ -118,7 +118,7 @@ ivas_error ivas_dec_get_format( 


    ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

#ifdef DECODER_FORMAT_SWITCHING

    isVoipMode = st_ivas->hDecoderConfig->Opt_tsm;

    Opt_tsm = st_ivas->hDecoderConfig->Opt_tsm;

#endif

    bit_stream_orig = st_ivas->bit_stream;
@@ -136,7 +136,7 @@ ivas_error ivas_dec_get_format( 
         !( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->last_ivas_format == MASA_FORMAT ) )

    {

#ifdef DECODER_FORMAT_SWITCHING

        if ( isVoipMode )

        if ( Opt_tsm )

        {

            st_ivas->restartNeeded = 1;
@@ -153,6 +153,7 @@ ivas_error ivas_dec_get_format( 
        }

#endif

    }



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

     * Read other signaling (ISM/MC mode, number of channels, etc.)

     *-------------------------------------------------------------------*/
@@ -185,7 +186,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -221,7 +222,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && sba_planar != st_ivas->sba_planar )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;

                    return IVAS_ERR_OK;
@@ -245,7 +246,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && sba_order != st_ivas->sba_order )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -276,7 +277,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 1] )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( st_ivas->nchan_transport == 1 && isVoipMode )

                if ( st_ivas->nchan_transport == 1 && Opt_tsm )

                {

                    masaRestartCandidate = 1;

                }
@@ -287,7 +288,7 @@ ivas_error ivas_dec_get_format( 
            else

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( st_ivas->nchan_transport == 2 && isVoipMode )

                if ( st_ivas->nchan_transport == 2 && Opt_tsm )

                {

                    masaRestartCandidate = 1;

                }
@@ -331,7 +332,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -362,7 +363,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -390,7 +391,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -430,7 +431,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && sba_order != st_ivas->sba_order )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -471,7 +472,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && st_ivas->transport_config != signaled_config )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;
@@ -569,7 +570,7 @@ ivas_error ivas_dec_get_format( 
            if ( st_ivas->ini_frame > 0 && nchan_ism != st_ivas->nchan_ism )

            {

#ifdef DECODER_FORMAT_SWITCHING

                if ( isVoipMode )

                if ( Opt_tsm )

                {

                    st_ivas->restartNeeded = 1;

lib_dec/lib_dec.c

+5 −7
Original line number Diff line number Diff line
@@ -3470,7 +3470,6 @@ ivas_error IVAS_DEC_GetAcousticEnvironment( 
#endif







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

 * copyRendererConfigStruct( )

 *
@@ -6168,7 +6167,6 @@ ivas_error IVAS_DEC_FeedPiDataToDecoder( 


                    st_ivas->hCombinedOrientationData->isDiegeticInputPISet = true;

                }



            }

            break;

#endif