Commit bc27786f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

- fix compilation with API_5MS disabled 

- replace usage of FRAMES_PER_SECOND defined in wmc_auto.h with FRAMES_PER_SEC
- fix for BE comparison MASA pytest
parent 4df7e82c

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1096,7 +1096,7 @@ ivas_error ivas_dec( 
            st_ivas->noClipping +=

#endif

                ivas_syn_output( p_output, output_frame,

#ifdef SPLIT_REND_WITH_HEAD_ROT

#if defined API_5MS && defined SPLIT_REND_WITH_HEAD_ROT

                                 nchan_out_syn_output,

#else

                     nchan_out,

lib_enc/ivas_ism_metadata_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ ivas_error ivas_ism_metadata_enc( 
        ism_total_brate_ref = *ism_total_brate;

        brate_limit_flag = calculate_brate_limit_flag( ism_imp, nchan_ism );



        bits_ism = (int16_t) ( *ism_total_brate / FRAMES_PER_SECOND );

        bits_ism = (int16_t) ( *ism_total_brate / FRAMES_PER_SEC );

        set_s( bits_element, bits_ism / nchan_ism, nchan_ism );

        bits_element[nchan_ism - 1] += bits_ism % nchan_ism;

        bitbudget_to_brate( bits_element, element_brate, nchan_ism );

lib_rend/ivas_splitRendererPre.c

+2 −2
Original line number Diff line number Diff line
@@ -1896,7 +1896,7 @@ static ivas_error split_renderer_open_lc3plus( SPLIT_REND_WRAPPER *hSplitRendWra 
    /* Alocate buffers for delay compensation */

    if ( pSplitRendConfig->codec == IVAS_SPLIT_REND_CODEC_LC3PLUS )

    {

        delayBufferLength = OutSampleRate / (int32_t) FRAMES_PER_SECOND + hSplitRendWrapper->lc3plusDelaySamples;

        delayBufferLength = OutSampleRate / (int32_t) FRAMES_PER_SEC + hSplitRendWrapper->lc3plusDelaySamples;

        for ( i = 0; i < hSplitRendWrapper->multiBinPoseData.num_poses * BINAURAL_CHANNELS; ++i )

        {

            hSplitRendWrapper->lc3plusDelayBuffers[i] = malloc( delayBufferLength * sizeof( float ) );
@@ -2155,7 +2155,7 @@ static ivas_error ivas_renderMultiTDBinToSplitBinaural( 
#ifdef API_5MS

        int32_t frame_size = hSplitBin->hLc3plusEnc->config.samplerate * codec_frame_size_ms / 1000;

#else

        int32_t frame_size = hSplitBin->hLc3plusEnc->config.samplerate / (int32_t) FRAMES_PER_SECOND;

        int32_t frame_size = hSplitBin->hLc3plusEnc->config.samplerate / (int32_t) FRAMES_PER_SEC;

#endif



        for ( i = 0; i < num_poses * BINAURAL_CHANNELS; ++i )

lib_rend/ivas_splitRenderer_utils.c

+14 −2
Original line number Diff line number Diff line
@@ -469,7 +469,13 @@ int32_t ivas_get_lc3plus_bitrate( const int32_t SplitRendBitRate, IVAS_SPLIT_REN 
{

    if ( poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB )

    {

        int32_t inBandMdBps = (int32_t) ( 8 * 1000 / split_prerender_frame_size_ms );

        int32_t inBandMdBps = (int32_t) ( 8 * 1000 /

#ifdef API_5MS

                                          split_prerender_frame_size_ms

#else

                                          FRAMES_PER_SEC

#endif

        );

        return ivas_get_lcld_bitrate( SplitRendBitRate, poseCorrectionMode ) - inBandMdBps;

    }

    if ( poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE )
@@ -564,7 +570,13 @@ int32_t ivas_get_lc3plus_size_from_id( const int8_t SplitRendBitRateId, IVAS_SPL 
    );



    /* Return size in bytes */

    return (int32_t) ( bitrate * split_prerender_frame_size_ms / 1000 / 8 );

    return (int32_t) ( bitrate *

#ifdef API_5MS

                       split_prerender_frame_size_ms

#else

                       FRAMES_PER_SEC

#endif

                       / 1000 / 8 );

}



ivas_error ivas_split_rend_validate_config( const IVAS_SPLIT_REND_CONFIG_DATA *pSplitRendConfig, const int16_t is_pcm_out )

lib_rend/lib_rend.c

+6 −1
Original line number Diff line number Diff line
@@ -9547,7 +9547,12 @@ ivas_error IVAS_REND_GetSamples( 
    IVAS_REND_AudioBuffer outAudio /* i/o: buffer for output audio  */

)

{

    return getSamplesInternal( hIvasRend, outAudio, NULL );

    return getSamplesInternal( hIvasRend, outAudio

#ifdef SPLIT_REND_WITH_HEAD_ROT

                               ,

                               NULL

#endif

    );

}



#ifdef SPLIT_REND_WITH_HEAD_ROT