Commit 5f9f5b52 authored by multrus's avatar multrus
Browse files

formatting

parent f833cad1

apps/decoder.c

+4 −7
Original line number Diff line number Diff line
@@ -1779,8 +1779,7 @@ static ivas_error initOnFirstGoodFrame( 
        /* If outputting ISM, get number of objects, open output files and write zero metadata for initial bad frames */

        if ( *pBsFormat == IVAS_DEC_BS_OBJ || *pBsFormat == IVAS_DEC_BS_MASA_ISM



             || *pBsFormat == IVAS_DEC_BS_SBA_ISM

        )

             || *pBsFormat == IVAS_DEC_BS_SBA_ISM )

        {

            if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, pNumObj ) ) != IVAS_ERR_OK )

            {
@@ -2155,9 +2154,7 @@ static ivas_error decodeG192( 
        /* Write MASA/ISM metadata to external file(s) */

        if ( decodedGoodFrame && arg.outputConfig == AUDIO_CONFIG_EXTERNAL )

        {

            if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM

                 || bsFormat == IVAS_DEC_BS_SBA_ISM

            )

            if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM || bsFormat == IVAS_DEC_BS_SBA_ISM )

            {

                if ( ( error = IVAS_DEC_GetNumObjects( hIvasDec, &numObj ) ) != IVAS_ERR_OK )

                {

apps/encoder.c

+1 −3
Original line number Diff line number Diff line
@@ -546,9 +546,7 @@ int main( 
        }

    }



    const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM || arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM

                                   || arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM

                                   )

    const int16_t numIsmInputs = ( arg.inputFormat == IVAS_ENC_INPUT_ISM || arg.inputFormat == IVAS_ENC_INPUT_MASA_ISM || arg.inputFormat == IVAS_ENC_INPUT_SBA_ISM )

                                     ? arg.inputFormatConfig.ism.numObjects

                                     : 0;

lib_com/options.h

+0 −5
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */







/*#define SPLIT_REND_WITH_HEAD_ROT*/                    /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS
@@ -161,9 +159,6 @@ 
#endif











/* ################## End BE DEVELOPMENT switches ######################### */



/* #################### Start NON-BE CR switches ########################## */

lib_dec/ivas_dec.c

+5 −9
Original line number Diff line number Diff line
@@ -220,20 +220,16 @@ ivas_error ivas_dec( 
        }

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt

                                                  ,

                                                  st_ivas->hSCE[0]->hCoreCoder[0]

                                                  ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, st_ivas->hDirAC->hParamIsm, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt,

                                                  st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

        else /* ISM_MODE_DISC */

        {

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt

                                                  ,

                                                  st_ivas->hSCE[0]->hCoreCoder[0]

                                                  ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_ism_metadata_dec( ivas_total_brate, st_ivas->nchan_ism, &( st_ivas->nchan_transport ), st_ivas->hIsmMetaData, st_ivas->hSCE, st_ivas->bfi, nb_bits_metadata, st_ivas->ism_mode, st_ivas->hISMDTX, NULL, &st_ivas->ism_extmeta_active, &st_ivas->ism_extmeta_cnt,

                                                  st_ivas->hSCE[0]->hCoreCoder[0] ) ) != IVAS_ERR_OK )

            {

                return error;

            }

lib_dec/ivas_init_dec.c

+2 −4
Original line number Diff line number Diff line
@@ -1076,13 +1076,11 @@ ivas_error ivas_init_decoder( 
            hDecoderConfig->nchan_out = audioCfg2channels( AUDIO_CONFIG_HOA3 );

            hDecoderConfig->nchan_out += st_ivas->nchan_ism;

        }

        else

            if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport + st_ivas->nchan_ism;

        }

        else

            if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        else if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport;

        }