Commit cabb1ba4 authored by vaclav's avatar vaclav
Browse files

accept NONBE_1303_REND_GRANULARITY

parent 42cf0da8

lib_com/ivas_prot.h

+0 −9
Original line number Diff line number Diff line
@@ -656,13 +656,11 @@ void ivas_renderer_select( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



#ifdef NONBE_1303_REND_GRANULARITY

/*! r: secondary binaural renderer type */

RENDERER_TYPE ivas_renderer_secondary_select(

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

);



#endif

ivas_error ivas_mc_enc_config(

    Encoder_Struct *st_ivas                                     /* i/o: IVAS encoder structure                  */

);
@@ -891,16 +889,9 @@ TC_BUFFER_MODE ivas_jbm_dec_get_tc_buffer_mode( 


/*! r: render granularity */

int16_t ivas_jbm_dec_get_render_granularity(

#ifdef NONBE_1303_REND_GRANULARITY

    const RENDERER_TYPE renderer_type,                          /* i  : renderer type                                               */

    const RENDERER_TYPE renderer_type_sec,                      /* i  : secondary renderer type                                     */

    const int32_t output_Fs                                     /* i  : sampling rate                                               */

#else

    const RENDERER_TYPE rendererType, /* i  : renderer type     */

    const IVAS_FORMAT ivas_format,    /* i  : ivas format */

    const MC_MODE mc_mode,            /* i  : MC mode */

    const int32_t output_Fs           /* i  : sampling rate     */

#endif

);



ivas_error ivas_jbm_dec_tc_buffer_open(

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1118_EVS_LR_HQ_BITERROR                   /* VA: issue 1118: fix EVS decoder crash in LR-HQ in case of bit errors */

#define NONBE_1303_REND_GRANULARITY                     /* VA: issue 1303: Renderer granularity revision */

#define NONBE_FIX_1305_OMASA_OBJ_EDIT_EXT               /* Nokia: issue 1305: Fix OMASA ext output in case of object editing */

lib_dec/ivas_init_dec.c

+1 −41
Original line number Diff line number Diff line
@@ -2119,6 +2119,7 @@ ivas_error ivas_init_decoder( 
        {

            return error;

        }



        if ( st_ivas->hOutSetup.output_config == IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        {

            if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs ) ) != IVAS_ERR_OK )
@@ -2126,16 +2127,6 @@ ivas_error ivas_init_decoder( 
                return error;

            }

        }

#ifndef NONBE_1303_REND_GRANULARITY



        granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )

        {

            return error;

        }

#endif

    }

    else if ( st_ivas->renderer_type == RENDERER_MC )

    {
@@ -2168,31 +2159,6 @@ ivas_error ivas_init_decoder( 
        }



        st_ivas->binaural_latency_ns = st_ivas->hCrendWrapper->binaural_latency_ns;

#ifndef NONBE_1303_REND_GRANULARITY



        if ( ( st_ivas->ivas_format == MC_FORMAT ) && ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )

        {

            granularity = NS2SA( output_Fs, CLDFB_SLOT_NS );



            n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, MC_PARAMUPMIX_MAX_INPUT_CHANS, MC_PARAMUPMIX_MAX_INPUT_CHANS, granularity ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

        else

        {

            granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES );



            n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )

            {

                return error;

            }

        }

#endif

    }



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
@@ -2388,16 +2354,10 @@ ivas_error ivas_init_decoder( 
    if ( st_ivas->hTcBuffer == NULL )

    {

        /* no module has yet open the TC buffer, open a default one */

#ifdef NONBE_1303_REND_GRANULARITY

        granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, ivas_renderer_secondary_select( st_ivas ), output_Fs );

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, granularity ) ) != IVAS_ERR_OK )

#else

        n_channels_transport_jbm = ivas_jbm_dec_get_num_tc_channels( st_ivas );



        if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, ivas_jbm_dec_get_tc_buffer_mode( st_ivas ), n_channels_transport_jbm, n_channels_transport_jbm, n_channels_transport_jbm, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

#endif

        {

            return error;

        }

lib_dec/ivas_ism_dec.c

+0 −20
Original line number Diff line number Diff line
@@ -122,24 +122,6 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
        mvs2s( st_ivas->hSpatParamRendCom->subframe_nbslots, st_ivas->hTcBuffer->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    }



#ifndef NONBE_1303_REND_GRANULARITY

    /* JBM: when granularity goes down (e.g. Discrete ISM with TD Obj Renderer -> ParamISM with binaural fastconv

            render what still fits in the new granularity */

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, st_ivas->ivas_format, st_ivas->mc_mode, st_ivas->hDecoderConfig->output_Fs );



    if ( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )

    {

        /* flush already done in IVAS_DEC_ReadFormat() */

    }

    /* JBM: when granularity goes up set samples to discard at the beginning of the frame */

    else if ( tc_granularity_new > st_ivas->hTcBuffer->n_samples_granularity )

    {

        if ( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

#endif

    if ( st_ivas->ism_mode != last_ism_mode )

    {

        /* EFAP handle */
@@ -307,9 +289,7 @@ static ivas_error ivas_ism_bitrate_switching_dec( 
    tc_nchan_tc_new = ivas_jbm_dec_get_num_tc_channels( st_ivas );

    tc_nchan_allocate_new = tc_nchan_tc_new;

    tc_nchan_full_new = tc_nchan_tc_new;

#ifdef NONBE_1303_REND_GRANULARITY

    tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, st_ivas->hDecoderConfig->output_Fs );

#endif



    if ( st_ivas->ism_mode == ISM_MODE_PARAM && ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC && st_ivas->renderer_type != RENDERER_BINAURAL_PARAMETRIC_ROOM ) )

    {

lib_dec/ivas_ism_param_dec.c

+1 −14
Original line number Diff line number Diff line
@@ -403,11 +403,7 @@ ivas_error ivas_param_ism_dec_open( 
    Decoder_Struct *st_ivas /* i/o: IVAS decoder structure      */

)

{

#ifdef NONBE_1303_REND_GRANULARITY

    int16_t i, granularity;

#else

    int16_t i;

#endif

    PARAM_ISM_DEC_HANDLE hParamIsmDec;

    IVAS_OUTPUT_SETUP hOutSetup;

    SPAT_PARAM_REND_COMMON_DATA_HANDLE hSpatParamRendCom;
@@ -543,9 +539,7 @@ ivas_error ivas_param_ism_dec_open( 
    st_ivas->hParamIsmDec = hParamIsmDec;

    st_ivas->hSpatParamRendCom = hSpatParamRendCom;



#ifdef NONBE_1303_REND_GRANULARITY

    granularity = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, RENDERER_DISABLE, output_Fs );

#endif



    if ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX && st_ivas->renderer_type != RENDERER_DISABLE )

    {
@@ -585,11 +579,7 @@ ivas_error ivas_param_ism_dec_open( 


        if ( st_ivas->hTcBuffer == NULL )

        {

#ifdef NONBE_1303_REND_GRANULARITY

            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, granularity ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_RENDERER, nchan_transport, nchan_transport, nchan_full, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }
@@ -602,11 +592,8 @@ ivas_error ivas_param_ism_dec_open( 
        if ( st_ivas->hTcBuffer == NULL )

        {

            int16_t nchan_to_allocate = st_ivas->hDecoderConfig->nchan_out;

#ifdef NONBE_1303_REND_GRANULARITY



            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, granularity ) ) != IVAS_ERR_OK )

#else

            if ( ( error = ivas_jbm_dec_tc_buffer_open( st_ivas, TC_BUFFER_MODE_BUFFER, nchan_to_allocate, nchan_to_allocate, nchan_to_allocate, NS2SA( st_ivas->hDecoderConfig->output_Fs, CLDFB_SLOT_NS ) ) ) != IVAS_ERR_OK )

#endif

            {

                return error;

            }