Commit 3552f361 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept/consolidate SPLIT_REND_PLC

parent e2aa726e

apps/renderer.c

+3 −15
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ 
#include "lib_rend.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "split_render_file_read_write.h"

#endif

#ifdef SPLIT_REND_PLC

#include "split_rend_bfi_file_reader.h"

#endif

#include <assert.h>
@@ -156,7 +154,7 @@ typedef struct 
    char outMetadataFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

    char headRotationFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#ifdef SPLIT_REND_PLC

#ifdef SPLIT_REND_WITH_HEAD_ROT

    char splitRendBFIFilePath[RENDERER_MAX_CLI_ARG_LENGTH];

#endif

    char referenceVectorFilePath[RENDERER_MAX_CLI_ARG_LENGTH];
@@ -201,8 +199,6 @@ typedef enum 
    CmdLnOptionId_inputGain,

#ifdef SPLIT_REND_WITH_HEAD_ROT

    CmdLnOptionId_outputMetadata,

#endif

#ifdef SPLIT_REND_PLC

    CmdLnOptionId_SplitRendBFIFile,

#endif

    CmdLnOptionId_referenceVectorFile,
@@ -263,8 +259,6 @@ static const CmdLnParser_Option cliOptions[] = { 
        .matchShort = "om",

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

    },

#endif

#ifdef SPLIT_REND_PLC

    {

        .id = CmdLnOptionId_SplitRendBFIFile,

        .match = "post_rend_bfi_file",
@@ -739,8 +733,6 @@ int main( 
    HANDLE_CLDFB_FILTER_BANK cldfbAna[MAX_INPUT_CHANNELS];

    HANDLE_CLDFB_FILTER_BANK cldfbSyn[MAX_INPUT_CHANNELS];

    int16_t cldfb_in, CLDFBframeSize_smpls;

#endif

#ifdef SPLIT_REND_PLC

    SplitRendBFIFileReader *splitRendBFIReader = NULL;

#endif

    Vector3PairFileReader *referenceVectorReader = NULL;
@@ -853,7 +845,7 @@ int main( 
        }

    }



#ifdef SPLIT_REND_PLC

#ifdef SPLIT_REND_WITH_HEAD_ROT

    if ( !isEmptyString( args.splitRendBFIFilePath ) )

    {

        convert_backslash( args.splitRendBFIFilePath );
@@ -1549,7 +1541,7 @@ int main( 
            }

        }



#ifdef SPLIT_REND_PLC

#ifdef SPLIT_REND_WITH_HEAD_ROT

        /* Read from split renderer bfi file if specified */

        if ( splitRendBFIReader != NULL )

        {
@@ -2467,8 +2459,6 @@ static CmdlnArgs defaultArgs( 
    clearString( args.headRotationFilePath );

#ifdef SPLIT_REND_WITH_HEAD_ROT

    clearString( args.outMetadataFilePath );

#endif

#ifdef SPLIT_REND_PLC

    clearString( args.splitRendBFIFilePath );

#endif

    clearString( args.referenceVectorFilePath );
@@ -2558,8 +2548,6 @@ static void parseOption( 
            assert( numOptionValues == 1 );

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

            break;

#endif

#ifdef SPLIT_REND_PLC

        case CmdLnOptionId_SplitRendBFIFile:

            assert( numOptionValues == 1 );

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

lib_com/cnst.h

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ enum 
#define CLDFB_NO_COL_MAX_SWITCH_BFI         10                     /* CLDFB resampling - max number of CLDFB col. for switching, BFI */

#define CLDFB_OVRLP_MIN_SLOTS               3                      /* CLDFB resampling - minimize processing to minimum required for transition frame ACELP->TCX/HQ */

#define INV_CLDFB_BANDWIDTH                 ( 1.f / 800.f )

#ifdef SPLIT_REND_PLC

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define CLDFB_PLC_XF                        2                      /* Length of cross-fade into first good frame after frame loss in CLDFB cols. */

#endif

lib_com/options.h

+0 −4
Original line number Diff line number Diff line
@@ -184,10 +184,6 @@ 


#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PLC

#endif /* SPLIT_REND_WITH_HEAD_ROT */



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

lib_rend/ivas_prot_rend.h

+1 −6
Original line number Diff line number Diff line
@@ -1119,11 +1119,8 @@ void ivas_splitBinLCLDDecProcess( 
    BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec,

    ivas_split_rend_bits_t *pBits,

    float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] 

#ifdef SPLIT_REND_PLC

    ,

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t bfi

#endif

);



ivas_error ivas_splitBinPreRendOpen(
@@ -1202,7 +1199,6 @@ void ivas_splitBinPostRendMdDec( 
#endif

);



#ifdef SPLIT_REND_PLC

ivas_error ivas_splitBinRendPLCOpen(

    SPLIT_REND_PLC_HANDLE* phSplitRendPLC

);
@@ -1226,7 +1222,6 @@ void ivas_splitBinRendPLC( 
    float Cldfb_RealBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_ImagBuffer_Binaural[BINAURAL_CHANNELS][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    const int16_t num_chs );

#endif /* SPLIT_REND_PLC */



#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

void ivas_log_cldfb2wav_data(

lib_rend/ivas_splitRend_lcld_dec.c

+2 −14
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ ivas_splitBinLCLDDecOpen( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec, 
    fwrite( &iChannels, sizeof( int ), 1, splitBinLCLDDec->cldfbOut );

    fwrite( &num_bands, sizeof( int ), 1, splitBinLCLDDec->cldfbOut );

#endif

#ifdef SPLIT_REND_PLC

    ivas_splitBinRendPLCOpen( &splitBinLCLDDec->hSplitRendPLC );

#endif



    *hSplitBinLCLDDec = splitBinLCLDDec;

    return error;
@@ -131,9 +129,7 @@ void ivas_splitBinLCLDDecClose( BIN_HR_SPLIT_LCLD_DEC_HANDLE *hSplitBinLCLDDec ) 
            fclose( ( *hSplitBinLCLDDec )->cldfbOut );

        }

#endif

#ifdef SPLIT_REND_PLC

        ivas_splitBinRendPLCClose( &( *hSplitBinLCLDDec )->hSplitRendPLC );

#endif



        free( *hSplitBinLCLDDec );

        *hSplitBinLCLDDec = NULL;
@@ -145,12 +141,8 @@ void ivas_splitBinLCLDDecProcess( 
    BIN_HR_SPLIT_LCLD_DEC_HANDLE hSplitBinLCLDDec,

    ivas_split_rend_bits_t *pBits,

    float Cldfb_Out_Real[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX],

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX]

#ifdef SPLIT_REND_PLC

    ,

    const int16_t bfi

#endif

)

    float Cldfb_Out_Imag[][CLDFB_NO_COL_MAX][CLDFB_NO_CHANNELS_MAX] ,

    const int16_t bfi)

{

    push_wmops( "ivas_splitBinLCLDDecProcess" );
@@ -162,10 +154,8 @@ void ivas_splitBinLCLDDecProcess( 
#ifdef CLDFB_DEBUG

    printf( "Bytes read = %d\n", iBytesWritten );

#endif

#ifdef SPLIT_REND_PLC

    if ( !bfi )

    {

#endif

        // Initialized with zeros....... :(

        for ( int32_t n = 0; n < hSplitBinLCLDDec->iChannels; n++ )

        {
@@ -204,7 +194,6 @@ void ivas_splitBinLCLDDecProcess( 
            }

        }

#endif

#ifdef SPLIT_REND_PLC

        if ( hSplitBinLCLDDec->hSplitRendPLC->prev_bfi != 0 )

        {

            /* cross-fade recovered frame into good frame */
@@ -218,7 +207,6 @@ void ivas_splitBinLCLDDecProcess( 
    }

    /* save PLC state */

    ivas_splitBinRendPLCsaveState( hSplitBinLCLDDec->hSplitRendPLC, Cldfb_Out_Real, Cldfb_Out_Imag, (int16_t) hSplitBinLCLDDec->iChannels );

#endif



    pop_wmops();