Commit 4020280e authored by vaclav's avatar vaclav
Browse files

Merge branch 'revision_of_todos' of... 

Merge branch 'revision_of_todos' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into revision_of_todos
parents a6b81490 dabc9818

lib_dec/ivas_vbap.c

+3 −1
Original line number Diff line number Diff line
@@ -178,11 +178,13 @@ ivas_error vbap_init_data( 
    push_wmops( "vbap_init" );



    /* Basic init checks */

    /* If the requested layout is invalid, hVBAPdata is set to NULL and the signal will

     * be distributed with an equal gain into all output channels.

     * The surrounding code needs to handle the NULL pointer properly. */

    if ( num_speaker_nodes > VBAP_MAX_NUM_SPEAKER_NODES || num_speaker_nodes < 3 )

    {

        hVBAPdata = NULL;

        pop_wmops();

        /* TODO: are these two paths correct behaviour or should and error be returned ? */

        return IVAS_ERR_OK;

    }

lib_enc/ivas_masa_enc.c

+0 −1
Original line number Diff line number Diff line
@@ -2100,7 +2100,6 @@ static uint8_t are_masa_subframes_similar( 
        }

    }



    /* TODO: a nicer negation */

    if ( sf_differ )

    {

        return FALSE;

lib_enc/ivas_mcmasa_enc.c

+4 −4
Original line number Diff line number Diff line
@@ -1241,7 +1241,7 @@ void ivas_mcmasa_param_est_enc( 


void ivas_mcmasa_dmx_modify(

    const int16_t n_samples,                                        /* i  : input frame length in samples                        */

    float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format. TODO: buffer size into define? */

    float dmx[][L_FRAME48k + NS2SA( 48000, IVAS_FB_ENC_DELAY_NS )], /* i/o: downmix signal to be transformed into another format */

    const int16_t n_chnls_dmx_old,                                  /* i  : number of downmix channels in the old format         */

    const int16_t n_chnls_dmx_new )                                 /* i  : number of downmix channels in the target format      */

{