Commit 3b64b06c authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Fix build with switch MASA_AND_OBJECTS inactive

parent 6c7cc000

lib_dec/ivas_ism_metadata_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ ivas_error ivas_ism_metadata_dec( 
    int16_t md_diff_flag[MAX_NUM_OBJECTS];

    ivas_error error;





    push_wmops( "ism_meta_dec" );

lib_dec/ivas_masa_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -814,7 +814,11 @@ static ivas_error ivas_masa_dec_config( 
    ivas_masa_set_coding_config(&(hMasa->config), hMasa->data.band_mapping, st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->nchan_transport, (st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA));

#endif

#ifdef HR_METADATA

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_512k )

#ifdef MASA_AND_OBJECTS

    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_512k )

#else

    if ((st_ivas->ivas_format == MASA_FORMAT ) && st_ivas->hDecoderConfig->ivas_total_brate == IVAS_512k)

#endif

    {

        hMasa->config.mergeRatiosOverSubframes = 0;

        /* initialize spherical grid */

lib_enc/ivas_masa_enc.c

+4 −0
Original line number Diff line number Diff line
@@ -317,7 +317,11 @@ ivas_error ivas_masa_encode( 
        }



#ifdef HR_METADATA

#ifdef MASA_AND_OBJECTS

        if ( ( ivas_format == MASA_FORMAT || ivas_format == MASA_ISM_FORMAT ) && ivas_total_brate >= IVAS_384k )

#else

        if ( (ivas_format == MASA_FORMAT) && ivas_total_brate >= IVAS_384k )

#endif

        {

            hMasa->config.mergeRatiosOverSubframes = 0;

        }