Commit ab0b493c authored by vaclav's avatar vaclav
Browse files

Merge branch '2051-ref-PortMr2059-from-float-renderer-granularity-revision'... 

Merge branch '2051-ref-PortMr2059-from-float-renderer-granularity-revision' into 'ivas-float-update'

Port MR2059 from float to FLP-ref - Renderer granularity revision

See merge request !2286
parents c33a5ce9 8c0b05cf

lib_com/ivas_prot.h

+6 −0
Original line number Diff line number Diff line
@@ -919,10 +919,16 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ 
#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define NONBE_FIX_1297_SPAR_JBM_MEM_SAN                 /* Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer */ 

#define NONBE_1303_GRANULARITY_OSBA_REND                /* VA: issue 1303: Correctly set the granularity in OSBA, Disc mode, and BINAURAL_ROOM_REVERB output */

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



// object-editing feature porting

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

lib_dec/ivas_init_dec.c

+12 −3
Original line number Diff line number Diff line
@@ -2213,7 +2213,7 @@ 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 );
@@ -2221,6 +2221,7 @@ ivas_error ivas_init_decoder( 
        {

            return error;

        }

#endif

    }

    else if ( st_ivas->renderer_type == RENDERER_MC )

    {
@@ -2257,7 +2258,7 @@ 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 );
@@ -2280,6 +2281,7 @@ ivas_error ivas_init_decoder( 
                return error;

            }

        }

#endif

    }



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
@@ -2293,7 +2295,7 @@ ivas_error ivas_init_decoder( 
            }

            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 )

                if ( ( error = ivas_reverb_open( &st_ivas->hReverb, st_ivas->hHrtfStatistics, st_ivas->hRenderConfig, output_Fs ) ) != IVAS_ERR_OK )

                {

                    return error;

                }
@@ -2481,9 +2483,16 @@ 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

+5 −1
Original line number Diff line number Diff line
@@ -148,7 +148,11 @@ static ivas_error ivas_ism_bitrate_switching_dec( 


        /* 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 */

#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 );

#else

    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 );

#endif



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

        {

lib_dec/ivas_ism_param_dec.c

+15 −0
Original line number Diff line number Diff line
@@ -403,7 +403,11 @@ 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;
@@ -539,6 +543,9 @@ 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 )

    {
@@ -578,7 +585,11 @@ 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;

            }
@@ -591,7 +602,11 @@ 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;

            }