Commit de65e137 authored by vaclav's avatar vaclav
Browse files

accept JBM_FOR_OSBA

parent be8c8d32

lib_com/ivas_cnst.h

+2 −6
Original line number Diff line number Diff line
@@ -181,13 +181,7 @@ typedef enum 
#define MAX_JBM_L_FRAME48k                      1920

#define MAX_JBM_L_FRAME_NS                      40000000L

#define MAX_SPAR_INTERNAL_CHANNELS              IVAS_SPAR_MAX_CH

#ifdef JBM_FOR_OSBA

#define MAX_CLDFB_DIGEST_CHANNELS               (FOA_CHANNELS + MAX_NUM_OBJECTS)

#else

#define MAX_CLDFB_DIGEST_CHANNELS               4

#endif



#define MASA_JBM_RINGBUFFER_FRAMES              3



typedef enum

{
@@ -1224,6 +1218,8 @@ enum 
#define MASA_MAXIMUM_TWO_DIR_BANDS              24

#define NBITS_HR_COH                            4



#define MASA_JBM_RINGBUFFER_FRAMES              3



typedef enum

{

    MASA_STEREO_NOT_DEFINED,

lib_com/ivas_prot.h

+1 −6
Original line number Diff line number Diff line
@@ -3467,9 +3467,7 @@ void ivas_sba_set_cna_cng_flag( 
);



ivas_error ivas_sba_dec_reconfigure(

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

#ifdef JBM_FOR_OSBA

    ,

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

    uint16_t *nSamplesFlushed,                                  /* o  : number of samples flushed               */

#ifdef SPLIT_REND_WITH_HEAD_ROT

    const PCM_RESOLUTION pcm_resolution,                        /* i  : type for the decoded PCM resolution     */
@@ -3477,7 +3475,6 @@ ivas_error ivas_sba_dec_reconfigure( 
#else

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

#endif

#endif

);



ivas_error ivas_sba_digest_tc(
@@ -5701,7 +5698,6 @@ ivas_error ivas_osba_data_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder handle                     */

);



#ifdef JBM_FOR_OSBA

ivas_error ivas_osba_dirac_td_binaural_jbm(

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

    const uint16_t nSamplesAsked,                               /* i  : number of CLDFB slots requested         */
@@ -5709,7 +5705,6 @@ ivas_error ivas_osba_dirac_td_binaural_jbm( 
    uint16_t *nSamplesAvailable,                                /* o  : number of CLDFB slots still to render   */

    float *output_f[]                                           /* o  : rendered time signal                    */

);

#endif



ivas_error ivas_osba_dirac_td_binaural(

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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ 
/* any switch which is non-be wrt selection floating point code */

/* all switches in this category should start with "NONBE_" */



#define JBM_FOR_OSBA                                          /* FhG: implement OSBA format in the JBM path */

#define NONBE_FIX_808_JBM_PARAMUPMIX_RS                       /* FhG: Issue 808: fix JBM MC rate switching */

#define NONBE_FIX_846_JBM_MASA_SIDSTART                       /* FhG: Issue #846: fix JBM for MASA DTX when the first frame is a SID frame */

#define NONBE_FIX_841_MC_RS_TDOBJ_RENDERER                    /* FhG: Issue #841: [Non-BE] Resolve "MC RS HRFT handle not set to NULL" */

lib_dec/ivas_corecoder_dec_reconfig.c

+0 −2
Original line number Diff line number Diff line
@@ -151,14 +151,12 @@ ivas_error ivas_corecoder_dec_reconfig( 
            st_ivas->hSCE[sce_id] = NULL;

        }



#ifdef JBM_FOR_OSBA

        if ( sba_dirac_stereo_flag_old && nCPE_old == 0 && st_ivas->hCPE[0] )

        {

            st_ivas->hCPE[0]->hCoreCoder[0] = 0; /* this has been deallocated as part of the SCE it actually belongs to */

            destroy_cpe_dec( st_ivas->hCPE[0] );

            st_ivas->hCPE[0] = NULL;

        }

#endif



        for ( cpe_id = st_ivas->nCPE; cpe_id < nCPE_old; cpe_id++ )

        {

lib_dec/ivas_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -733,11 +733,8 @@ ivas_error ivas_dec( 
                    delay_signal( p_output[n], output_frame, st_ivas->hSbaIsmData->delayBuffer[n], st_ivas->hSbaIsmData->delayBuffer_size );

                }

            }

#ifdef JBM_FOR_OSBA



            if ( ( error = ivas_sba_upmixer_renderer( st_ivas, p_output, output_frame ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_sba_upmixer_renderer( st_ivas, &p_output[sba_ch_idx], output_frame ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }