Commit f5271efe authored by vaclav's avatar vaclav
Browse files

fix merge issue

parent 3df31973

lib_dec/ivas_omasa_dec_fx.c

+25 −22
Original line number Diff line number Diff line
@@ -437,11 +437,7 @@ ivas_error ivas_omasa_dec_config_fx( 
    Word16 *data /* o  : output synthesis signal                                 Qx*/

)

{

#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

    Word16 k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old;

#else

    Word16 k, sce_id, nSCE_old, nchan_hp20_old, numCldfbAnalyses_old, numCldfbSyntheses_old, n_MD;

#endif

    Word32 ivas_total_brate, ism_total_brate, cpe_brate;

    Word32 brate_SCE, brate_CPE;

    ISM_MODE ism_mode_old;
@@ -567,6 +563,12 @@ ivas_error ivas_omasa_dec_config_fx( 
    IF( NE_16( ism_mode_old, st_ivas->ism_mode ) )

    {

        /* ISM MD reconfig. */

        n_MD = 0;

        move16();

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {

            /* the full number of hIsmMetaData are needed for EXT output */

#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

            IF( st_ivas->hIsmMetaData[0] == NULL )

            {
@@ -583,12 +585,6 @@ ivas_error ivas_omasa_dec_config_fx( 
                }

            }

#else

        n_MD = 0;

        move16();

#ifdef NONBE_FIX_984_OMASA_EXT_OUTPUT

        IF( EQ_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )

        {

            /* the full number of hIsmMetaData are needed for EXT output */

            move16();

            n_MD = st_ivas->nchan_ism;

            ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );
@@ -601,6 +597,7 @@ ivas_error ivas_omasa_dec_config_fx( 
            }



            ivas_ism_metadata_close( st_ivas->hIsmMetaData, n_MD );

#endif

        }

        ELSE

        {
@@ -619,14 +616,21 @@ ivas_error ivas_omasa_dec_config_fx( 
                        return error;

                    }

                }

#ifdef NONBE_FIX_1065_ISM_MD_HANDLE

                ELSE

                {

                    ivas_ism_reset_metadata_handle_dec_fx( st_ivas->hIsmMetaData[0] );

                }

#endif

            }

            ELSE IF( EQ_32( st_ivas->ism_mode, ISM_MASA_MODE_DISC ) )

            {

                n_MD = st_ivas->nchan_ism;

                move16();



#ifndef NONBE_FIX_1065_ISM_MD_HANDLE

                ivas_ism_metadata_close( st_ivas->hIsmMetaData, 0 );



#endif

                error = ivas_ism_metadata_dec_create_fx( st_ivas, st_ivas->nchan_ism, NULL );

                move32();

                IF( NE_32( error, IVAS_ERR_OK ) )
@@ -666,7 +670,6 @@ ivas_error ivas_omasa_dec_config_fx( 
        }



        ivas_ism_metadata_close( st_ivas->hIsmMetaData, n_MD );

#endif

#endif



        st_ivas->hCPE[0]->element_brate = L_sub( ivas_total_brate, ism_total_brate );