Commit f7433f79 authored by vaclav's avatar vaclav
Browse files

maintenance

parent ae7da421

apps/decoder.c

+4 −1
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ int main( 
            fprintf( stderr, "Failed to get directivity patterns for one or more of IDs: %d %d %d %d\n\n", arg.directivityPatternId[0], arg.directivityPatternId[1], arg.directivityPatternId[2], arg.directivityPatternId[3] );

            goto cleanup;

        }



#ifdef CONF_DISTATT

        if ( ( error = RenderConfigReader_getDistanceAttenuation( renderConfigReader, renderConfig.distAtt ) ) != IVAS_ERR_OK )

        {
@@ -671,6 +672,7 @@ int main( 
            goto cleanup;

        }

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ||

               arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) )
@@ -723,6 +725,7 @@ int main( 
            }

            renderConfig.roomAcoustics.override = true;

        }



#ifdef SPLIT_REND_WITH_HEAD_ROT

#ifdef ISAR_BITSTREAM_UPDATE_LC3PLUS

        /* ISAR frame size is set from command line, not renderer config file.
@@ -1166,6 +1169,7 @@ static bool parseCmdlIVAS_dec( 
#else

    arg->acousticEnvironmentId = 65535;

#endif



    for ( i = 0; i < IVAS_MAX_NUM_OBJECTS; ++i )

    {

        arg->directivityPatternId[i] = 65535;
@@ -2341,7 +2345,6 @@ static ivas_error decodeG192( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

    SplitFileReadWrite *splitRendWriter = NULL;

#endif



#ifdef FIX_1053_REVERB_RECONFIGURATION

    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;

lib_com/ivas_sba_config.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ int16_t ivas_sba_get_nchan( 
    return ( nb_channels );

}





#ifdef NONBE_FIX_1052_SBA_EXT

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

 * ivas_sba_spar_sid_bitlen()
@@ -182,6 +183,7 @@ int16_t ivas_sba_spar_sid_bitlen( 
}

#endif





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

 * ivas_sba_get_nchan_metadata()

 *

lib_dec/ivas_dirac_dec.c

+3 −1
Original line number Diff line number Diff line
@@ -1107,6 +1107,7 @@ void ivas_dirac_dec_read_BS( 
#else

        st->next_bit_pos = (int16_t) ( ivas_total_brate / FRAMES_PER_SEC - 1 - SID_FORMAT_NBITS );

#endif



        /* 1 bit flag for signaling metadata to read */

        b = st->bit_stream[( st->next_bit_pos )--];

        ( *nb_bits )++;
@@ -1131,6 +1132,7 @@ void ivas_dirac_dec_read_BS( 
#else

        *nb_bits += ivas_qmetadata_dec_sid_decode( hQMetaData, st->bit_stream, &( st->next_bit_pos ), 0, NULL, SBA_FORMAT );

#endif



        for ( i = 0; i < MAX_PARAM_SPATIAL_SUBFRAMES; i++ )

        {

            hQMetaData->q_direction[0].band_data[orig_dirac_bands - 1].azimuth[i] = hQMetaData->q_direction[0].band_data[1].azimuth[0];

lib_dec/ivas_dirac_output_synthesis_cov.c

+1 −0
Original line number Diff line number Diff line
@@ -589,6 +589,7 @@ int16_t computeMixingMatrices( 
#else

    limit = limit * reg_Sx + EPSILON;

#endif



    for ( i = 0; i < lengthCx; ++i )

    {

        svd_s_buffer[i] = ( ( svd_s_buffer[i] > limit ) ? svd_s_buffer[i] : limit );

lib_dec/ivas_init_dec.c

+9 −14
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static ivas_error ivas_dec_init_split_rend( 
#endif



#ifdef NONBE_FIX_1052_SBA_EXT

static AUDIO_CONFIG ivas_set_output_config_from_sba_order( const int16_t sba_order )

static AUDIO_CONFIG ivas_set_output_config_from_sba_order(

    const int16_t sba_order )

{

    AUDIO_CONFIG output_config;

    output_config = IVAS_AUDIO_CONFIG_HOA3;
@@ -286,7 +287,7 @@ ivas_error ivas_dec_setup( 
#endif

)

{

    int16_t k, idx, num_bits_read;

    int16_t k, n, idx, num_bits_read;

    int16_t nchan_ism, element_mode_flag;

    Decoder_State *st;

    int32_t ivas_total_brate;
@@ -415,6 +416,7 @@ ivas_error ivas_dec_setup( 
                {

                    st_ivas->nchan_ism = 1;

                }



                /* for MASA_ISM_FORMAT at input the number of MASA transport channels is always 2 and the corresponding bit is not used here*/

#else

                /* the input_ivas_format should be MASA_ISM_FORMAT, but we cannot initialize it now */
@@ -534,17 +536,14 @@ ivas_error ivas_dec_setup( 
                if ( st_ivas->ini_frame > 0 && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

                {

#ifdef NONBE_FIX_ISM_XOVER_BR

                    {

                        int16_t n;



                    n = st_ivas->nchan_transport + st_ivas->nchan_ism;

                    st_ivas->nCPE = ( n + 1 ) >> 1;

                    }

#else

                    st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;

#endif

                }

            }



#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC )

#else
@@ -1666,12 +1665,8 @@ ivas_error ivas_init_decoder( 
        if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

        {

#ifdef NONBE_FIX_ISM_XOVER_BR

            {

                int16_t n_all;



                n_all = st_ivas->nchan_transport + st_ivas->nchan_ism;

                st_ivas->nCPE = ( n_all + 1 ) >> 1;

            }

            n = st_ivas->nchan_transport + st_ivas->nchan_ism;

            st_ivas->nCPE = ( n + 1 ) >> 1;

#else

            st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;

#endif