Commit ec6555df authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch... 

Merge branch 'float-1494-the-ivas_rend_setsplitrendbfi-function-is-not-used-in-ivas-decoder-renderer' into 'main'

Resolve "The IVAS_REND_SetSplitRendBFI() function is not used in IVAS decoder/renderer"

See merge request !2480
parents 14fa671a 658e9e9d

apps/renderer.c

+18 −0
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ 
#include "rotation_file_reader.h"

#include "aeid_file_reader.h"

#include "split_render_file_read_write.h"

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

#include "split_rend_bfi_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#ifdef DEBUGGING

#include "debug.h"
@@ -168,7 +170,9 @@ typedef struct 
    int16_t numInMetadataFiles;

    char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

    char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char referenceRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

    char externalOrientationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -219,7 +223,9 @@ typedef enum 
    CmdLnOptionId_listFormats,

    CmdLnOptionId_inputGain,

    CmdLnOptionId_outputMetadata,

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    CmdLnOptionId_SplitRendBFIFile,

#endif

    CmdLnOptionId_referenceVectorFile,

    CmdLnOptionId_exteriorOrientationFile,

    CmdLnOptionId_framing,
@@ -278,12 +284,14 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "om",

        .description = "coded metadata file for BINAURAL_SPLIT_PCM output mode",

    },

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    {

        .id = CmdLnOptionId_SplitRendBFIFile,

        .match = "post_rend_bfi_file",

        .matchShort = "prbfi",

        .description = "Split rendering option: bfi file",

    },

#endif

    {

        .id = CmdLnOptionId_refRotFile,

        .match = "reference_rotation_file",
@@ -688,7 +696,9 @@ int main( 
    IVAS_CLDFB_FILTER_BANK_HANDLE cldfbAna[RENDERER_MAX_INPUT_CHANNELS];

    IVAS_CLDFB_FILTER_BANK_HANDLE cldfbSyn[RENDERER_MAX_INPUT_CHANNELS];

    int16_t cldfb_in_flag, CLDFBframeSize_smpls;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    SplitRendBFIFileReader *splitRendBFIReader = NULL;

#endif

    Vector3PairFileReader *referenceVectorReader = NULL;

    hrtfFileReader *hrtfFileReader = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;
@@ -819,11 +829,13 @@ int main( 
        }

    }



#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    if ( !isEmptyString( args.splitRendBFIFilePath ) )

    {

        convert_backslash( args.splitRendBFIFilePath );

        SplitRendBFIFileReader_open( args.splitRendBFIFilePath, &splitRendBFIReader );

    }

#endif



    if ( !isEmptyString( args.externalOrientationFilePath ) )

    {
@@ -2072,7 +2084,9 @@ cleanup: 
    }



    split_rend_reader_writer_close( &hSplitRendFileReadWrite );

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    SplitRendBFIFileReader_close( &splitRendBFIReader );

#endif



    for ( i = 0; i < RENDERER_MAX_MC_INPUTS; ++i )

    {
@@ -2682,7 +2696,9 @@ static CmdlnArgs defaultArgs( 


    clearString( args.headRotationFilePath );

    clearString( args.outMetadataFilePath );

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    clearString( args.splitRendBFIFilePath );

#endif

    clearString( args.referenceVectorFilePath );

    clearString( args.referenceRotationFilePath );

    clearString( args.customHrtfFilePath );
@@ -2789,10 +2805,12 @@ static void parseOption( 
            assert( numOptionValues == 1 );

            strncpy( args->outMetadataFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

        case CmdLnOptionId_SplitRendBFIFile:

            assert( numOptionValues == 1 );

            strncpy( args->splitRendBFIFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

            break;

#endif

        case CmdLnOptionId_referenceVectorFile:

            assert( numOptionValues == 1 );

            strncpy( args->referenceVectorFilePath, optionValues[0], RENDERER_MAX_CLI_ARG_LENGTH - 1 );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ 
#define FIX_1827_REMOVE_UNUSED_PSNOISEGEN_ISAR          /* Dolby: remove unused noise generator from ISAR */

#define FIX_1487_ACCESS_OF_UNINIT_VAL_FROM_ARR_ISM_DTX  /* FhG/VA: init nb_bits_metadata to zero */

#define FIX_1477_OOB_INDEX_IN_D_ACELP_INDEXING          /* FhG: fix oob indexing */

#define FIX_1494_SET_SPLITBFI_UNUSED                    /* Dolby: Fix issue 1494, remove unused function setting BFI flag in ISAR renderer */



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

lib_rend/lib_rend.c

+10 −0
Original line number Diff line number Diff line
@@ -89,7 +89,9 @@ typedef struct 
    const EFAP_WRAPPER *pEfapOutWrapper;

    const IVAS_REND_HeadRotData *pHeadRotData;

    const RENDER_CONFIG_HANDLE *hhRendererConfig;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    const int16_t *pSplitRendBFI;

#endif

    const SPLIT_REND_WRAPPER *pSplitRendWrapper;

    const COMBINED_ORIENTATION_HANDLE *pCombinedOrientationData;

    const IVAS_DefaultReverbSize *pSelectedRoomReverbSize;
@@ -213,7 +215,9 @@ struct IVAS_REND 
    EFAP_WRAPPER efapOutWrapper;

    IVAS_LSSETUP_CUSTOM_STRUCT customLsOut;



#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    int16_t splitRendBFI;

#endif

    SPLIT_REND_WRAPPER *splitRendWrapper;

    IVAS_REND_AudioBuffer splitRendEncBuffer;
@@ -1236,7 +1240,9 @@ static rendering_context getRendCtx( 
    ctx.pEfapOutWrapper = &hIvasRend->efapOutWrapper;

    ctx.pHeadRotData = &hIvasRend->headRotData;

    ctx.hhRendererConfig = &hIvasRend->hRendererConfig;

#ifndef FIX_1494_SET_SPLITBFI_UNUSED

    ctx.pSplitRendBFI = &hIvasRend->splitRendBFI;

#endif

    ctx.pSplitRendWrapper = hIvasRend->splitRendWrapper;

    ctx.pCombinedOrientationData = &hIvasRend->hCombinedOrientationData;

    ctx.pSelectedRoomReverbSize = &hIvasRend->selectedRoomReverbSize;
@@ -5059,6 +5065,8 @@ ivas_error IVAS_REND_DisableHeadRotation( 
}





#ifndef FIX_1494_SET_SPLITBFI_UNUSED



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

 * IVAS_REND_SetSplitRendBFI()

 *
@@ -5075,6 +5083,8 @@ ivas_error IVAS_REND_SetSplitRendBFI( 
    return IVAS_ERR_OK;

}



#endif





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

 * IVAS_REND_SetOrientationTrackingMode()

lib_rend/lib_rend.h

+2 −0
Original line number Diff line number Diff line
@@ -338,10 +338,12 @@ ivas_error IVAS_REND_SetReferenceVector( 
    const IVAS_VECTOR3 refPos                       /* i  : Reference position                                  */

);



#ifndef FIX_1494_SET_SPLITBFI_UNUSED

ivas_error IVAS_REND_SetSplitRendBFI(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                     */

    const int16_t bfi                               /* i  : bad frame indicator                                 */

);

#endif



ivas_error IVAS_REND_SetExternalOrientation(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: Renderer handle                                                         */