Commit c60b804b authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch '1170-missing-test-cases-for-binaural_room_reverb' of... 

Merge branch '1170-missing-test-cases-for-binaural_room_reverb' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into 1170-missing-test-cases-for-binaural_room_reverb
parents 85495d8b 715f6b3e

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 


/* ################## Start DEVELOPMENT switches ######################### */



/*#define OBJ_EDITING_INTERFACE*/                      /* Interface for object editing */

#define OBJ_EDITING_INTERFACE                          /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

#define OBJ_EDITING_API                                /* object editing changes related to the API */

#define OBJ_EDITING_EXAMPLE                            /* obj editing example code in decoder.c */

lib_dec/ivas_jbm_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -792,7 +792,7 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
    float *p_data_f[MAX_CLDFB_DIGEST_CHANNELS];

    int16_t n, n_render_timeslots;



    push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );

    push_wmops( "ivas_jbm_dec_feed_tc_to_renderer" );

    for ( n = 0; n < MAX_CLDFB_DIGEST_CHANNELS; n++ )

    {

        p_data_f[n] = &data_f[n][0];
@@ -3012,7 +3012,7 @@ void ivas_jbm_dec_prepare_renderer( 
{

    int16_t n, n_render_timeslots;



    push_wmops( "ivas_jbm_dec_feed_tc_to_rendererer" );

    push_wmops( "ivas_jbm_dec_prepare_renderer" );



    n_render_timeslots = st_ivas->hTcBuffer->n_samples_available / st_ivas->hTcBuffer->n_samples_granularity;

lib_dec/lib_dec.c

+8 −6
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
            bfi = 2;

        }

    }



    if ( ( error = read_indices( hIvasDec->st_ivas, serial, num_bits, &hIvasDec->prev_ft_speech, &hIvasDec->CNG, bfi ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -911,9 +910,11 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
    hIvasDec->nSamplesAvailableNext = hIvasDec->nSamplesFrame;



#ifdef OBJ_EDITING_API

    /* decode TCs, do TSM and feed to renderer */

    /* setup */

    if ( hIvasDec->hasBeenFedFirstGoodFrame )

    /* Decode TCs, do TSM and feed to renderer.

           If TSM is generally enabled, we have to wait for the first good frame.

           Otherwise, we directly decode the first frame in any case.

        */

    if ( ( hIvasDec->st_ivas->hDecoderConfig->Opt_tsm && hIvasDec->hasBeenFedFirstGoodFrame ) || !hIvasDec->st_ivas->hDecoderConfig->Opt_tsm )

    {

        uint16_t l_ts, nTimeScalerOutSamples;

        uint8_t nTransportChannels, nOutChannels;
@@ -982,6 +983,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
                return IVAS_ERR_UNKNOWN;

            }

        }

        hIvasDec->hasBeenFedFrame = false;

    }

    hIvasDec->hasBeenPreparedRendering = false;
@@ -1381,7 +1383,7 @@ ivas_error IVAS_DEC_SetEditableParameters( 
/*---------------------------------------------------------------------*

 * IVAS_DEC_PrepareRenderer( )

 *

 * Main function to decode to PCM data

 * prepare IVAS JBM renderer

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

ivas_error IVAS_DEC_PrepareRenderer(

    IVAS_DEC_HANDLE hIvasDec )
@@ -1598,7 +1600,7 @@ ivas_error IVAS_DEC_GetSamples( 
#ifdef DEBUGGING

                else

                {

                    assert( 0 & "wrong PCM type for the flush buffer!" );

                    assert( 0 && "wrong PCM type for the flush buffer!" );

                }

#endif

                nSamplesRendered += hIvasDec->nSamplesFlushed;

scripts/config/self_test.prm

+3 −3
Original line number Diff line number Diff line
@@ -1362,15 +1362,15 @@ eid-xor -fer -vbr -bs g192 -ep g192 bit ../scripts/dly_error_profiles/ep_5pct.g1 
../IVAS_dec -t testv/headrot.csv BINAURAL_ROOM_IR 48 bit testv/stv514MC48c.wav_MC514_48000_48-48_BinauralRoom_Headrot.tst



// Multi-channel 5_1_4 at 512 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration

../IVAS_cod -mc 5_1_4 512000 48 testv/stv51MC48c.wav bit

../IVAS_cod -mc 5_1_4 512000 48 testv/stv514MC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv51MC48c.wav_MC514_512000_48-48_BINAURAL_ROOM_REVERB.tst



// Multi-channel 7_1_4 at 160 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration

../IVAS_cod -mc 7_1_4 160000 48 testv/stv71MC48c.wav bit

../IVAS_cod -mc 7_1_4 160000 48 testv/stv714MC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv71MC48c.wav_MC714_160000_48-48_BINAURAL_ROOM_REVERB.tst



// Multi-channel 7_1_4 at 512 kbps, 48kHz in, 48 kHz out, BINAURAL_ROOM_REVERB out default configuration

../IVAS_cod -mc 7_1_4 512000 48 testv/stv71MC48c.wav bit

../IVAS_cod -mc 7_1_4 512000 48 testv/stv714MC48c.wav bit

../IVAS_dec BINAURAL_ROOM_REVERB 48 bit testv/stv71MC48c.wav_MC714_512000_48-48_BINAURAL_ROOM_REVERB.tst



// Multi-channel 7_1_4 at 48 kbps, 48kHz in, 48kHz out, MONO out, bandwidth switching