Commit 84ae20ce authored by vaclav's avatar vaclav
Browse files

Merge branch '910-paramupmx-mc-binaural-decoding-uses-20ms-frame-length' into 'main' 

Resolve "ParamUpmx MC binaural decoding uses 20ms frame length"

See merge request !1263
parents 02dd1728 ce4c94a5

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -5861,12 +5861,14 @@ ivas_error ivas_td_binaural_open( 
    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                  */

);



#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND

ivas_error ivas_td_binaural_renderer(

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

    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */

    const int16_t output_frame                                  /* i  : output frame length                     */

);



#endif

ivas_error ivas_td_binaural_renderer_sf(

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

    float *output[],                                            /* i/o: SCE channels / Binaural synthesis       */

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */

#define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */



/* #################### End BE switches ################################## */

lib_dec/ivas_jbm_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1364,6 +1364,7 @@ ivas_error ivas_jbm_dec_render( 
            {

                ivas_mc2sba( st_ivas->hIntSetup, p_output, p_output, *nSamplesRendered, st_ivas->hOutSetup.ambisonics_order, 0.f );

            }

#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -1387,6 +1388,7 @@ ivas_error ivas_jbm_dec_render( 
                }

#endif

            }

#endif

        }

        else if ( st_ivas->mc_mode == MC_MODE_PARAMMC )

        {

lib_dec/ivas_objectRenderer_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ ivas_error ivas_td_binaural_open( 
                                         st_ivas->transport_config, st_ivas->hRenderConfig->directivity, st_ivas->hTransSetup, &st_ivas->hBinRendererTd, &st_ivas->binaural_latency_ns );

}





#ifndef FIX_910_REMOVE_DUPLICATION_TD_REND

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

 * ivas_td_binaural_renderer()

 *
@@ -100,7 +100,7 @@ ivas_error ivas_td_binaural_renderer( 


    return ivas_td_binaural_renderer_unwrap( st_ivas->hReverb, st_ivas->transport_config, st_ivas->hBinRendererTd, nchan_transport, LFE_CHANNEL, st_ivas->ivas_format, st_ivas->hIsmMetaData, st_ivas->hCombinedOrientationData, ism_md_subframe_update, output, output_frame, MAX_PARAM_SPATIAL_SUBFRAMES );

}



#endif



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

 * ivas_td_binaural_renderer_sf()

lib_dec/ivas_output_config.c

+8 −0
Original line number Diff line number Diff line
@@ -230,9 +230,17 @@ void ivas_renderer_select( 
#endif

                {

#ifdef DEBUGGING

#ifdef FIX_910_REMOVE_DUPLICATION_TD_REND

                    if ( ( ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 || st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && st_ivas->mc_mode == MC_MODE_MCT && st_ivas->hDecoderConfig->force_rend != FORCE_CLDFB_RENDERER )

#else

                    if ( ( ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 || st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) ) || ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) ) && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) && !( st_ivas->hDecoderConfig->force_rend == FORCE_CLDFB_RENDERER ) )

#endif

#else

#ifdef FIX_910_REMOVE_DUPLICATION_TD_REND

                    if ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 || st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && st_ivas->mc_mode == MC_MODE_MCT )

#else

                    if ( ( st_ivas->transport_config == IVAS_AUDIO_CONFIG_5_1 || st_ivas->transport_config == IVAS_AUDIO_CONFIG_7_1 ) && ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && ( st_ivas->mc_mode == MC_MODE_MCT || st_ivas->mc_mode == MC_MODE_PARAMUPMIX ) )

#endif

#endif

                    {

                        *renderer_type = RENDERER_BINAURAL_OBJECTS_TD;