Commit 446c933e authored by vaclav's avatar vaclav
Browse files

fix conflict

parent 64ca3ae8

lib_com/ivas_prot.h

+2 −15
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ void stereo_dmx_evs_close_encoder( 
    STEREO_DMX_EVS_ENC_HANDLE *hStereoDmxEVS                    /* i/o: Stereo downmix for EVS encoder handle   */

);



ivas_error ivas_dec_tmp(

ivas_error ivas_dec_tmp( // this will be removed in the following step

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                  */

    int16_t *data                                               /* o  : output synthesis signal                 */

);
@@ -835,22 +835,9 @@ void QuaternionInverse( 


#endif

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

 * decoder->rendering TC buffer prototypes

 * Internal rendering prototypes

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



ivas_error ivas_jbm_dec_tc(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                                      */

);



ivas_error ivas_jbm_dec_render(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */

    const uint16_t nSamplesAsked,                               /* i  : number of samples wanted                                    */

    uint16_t *nSamplesRendered,                                 /* o  : number of samples rendered                                  */

    uint16_t *nSamplesAvailableNext,                            /* o  : number of samples still available in the rendering pipeline */

    const PCM_RESOLUTION pcm_resolution,                        /* i  : type for the decoded PCM resolution                         */

    void *data                                                  /* o  : output synthesis signal                                     */

);



ivas_error ivas_jbm_dec_flush_renderer(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                      */

    const int16_t tc_granularity_new,                           /* i  : new renderer granularity                                    */

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
 * Principal IVAS decoder routine

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



ivas_error ivas_dec_tmp(

ivas_error ivas_dec_tmp( // this will be removed in the following step

    Decoder_Struct *st_ivas, /* i/o: IVAS decoder structure      */

    int16_t *data            /* o  : output synthesis signal     */

)

lib_dec/ivas_jbm_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ ivas_error ivas_dec_render( 
            if ( st_ivas->ivas_format == MONO_FORMAT )

            {

                /* routed to W */

                ivas_jbm_dec_tc_buffer_playout( st_ivas, nSamplesAskedLocal, nSamplesRendered, p_output );

                ivas_dec_tc_buffer_playout( st_ivas, nSamplesAskedLocal, nSamplesRendered, p_output );

            }

            else if ( st_ivas->ivas_format == STEREO_FORMAT )

            {