Commit d5b48dc4 authored by vaclav's avatar vaclav
Browse files

replace hard coded numbers by define

parent 3a5b12b7

lib_dec/ivas_masa_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -865,7 +865,11 @@ static ivas_error ivas_masa_dec_config( 
    for ( i = 0; i < st_ivas->hQMetaData->no_directions; i++ )

    {

        st_ivas->hQMetaData->q_direction[i].cfg.nbands = hMasa->config.numCodingBands;

#ifdef FIX_1161_REDUCE_OMASA_HEAP

        st_ivas->hQMetaData->q_direction[i].cfg.nblocks = hMasa->config.joinedSubframes == TRUE ? 1 : MAX_PARAM_SPATIAL_SUBFRAMES;

#else

        st_ivas->hQMetaData->q_direction[i].cfg.nblocks = hMasa->config.joinedSubframes == TRUE ? 1 : 4;

#endif



        if ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode == MC_MODE_MCMASA )

        {

lib_enc/ivas_masa_enc.c

+12 −0
Original line number Diff line number Diff line
@@ -838,7 +838,11 @@ ivas_error ivas_masa_enc_config( 
    for ( i = 0; i < hQMetaData->no_directions; i++ )

    {

        hQMetaData->q_direction[i].cfg.nbands = hMasa->config.numCodingBands;

#ifdef FIX_1161_REDUCE_OMASA_HEAP

        hQMetaData->q_direction[i].cfg.nblocks = hMasa->config.joinedSubframes == TRUE ? 1 : MAX_PARAM_SPATIAL_SUBFRAMES;

#else

        hQMetaData->q_direction[i].cfg.nblocks = hMasa->config.joinedSubframes == TRUE ? 1 : 4;

#endif



        if ( ivas_format == MC_FORMAT )

        {
@@ -1351,7 +1355,11 @@ static void move_metadata_to_qmetadata( 


    numCodingBands = hMasa->config.numCodingBands;

    numDirections = hMasa->config.numberOfDirections;

#ifdef FIX_1161_REDUCE_OMASA_HEAP

    numSf = hMasa->config.joinedSubframes == TRUE ? 1 : MAX_PARAM_SPATIAL_SUBFRAMES;

#else

    numSf = hMasa->config.joinedSubframes == TRUE ? 1 : 4;

#endif

    hMeta = &( hMasa->masaMetadata );



    for ( dir = 0; dir < numDirections; dir++ )
@@ -2646,7 +2654,11 @@ void ivas_merge_masa_metadata( 


    numCodingBands = hMasa->config.numCodingBands;

    numDirections = hMasa->config.numberOfDirections;

#ifdef FIX_1161_REDUCE_OMASA_HEAP

    numSf = hMasa->config.joinedSubframes == TRUE ? 1 : MAX_PARAM_SPATIAL_SUBFRAMES;

#else

    numSf = hMasa->config.joinedSubframes == TRUE ? 1 : 4;

#endif

    hMeta = &( hMasa->masaMetadata );



    for ( sf = 0; sf < numSf; sf++ )