Commit 034ca33e authored by stoutjesdijk's avatar stoutjesdijk 🎧
Browse files

merge with FhG/external-renderer

parent 2ebf0e7b

apps/encoder.c

+28 −6
Original line number Diff line number Diff line
@@ -120,11 +120,13 @@ typedef struct 
    const char *ca_config_file;

    bool mimeOutput;



#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    IVAS_ENC_AGC agc;

#else

    bool agc;

#endif

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    bool pca;

#ifdef DEBUG_FOA_AGC

    FILE *agcBitstream; /* temporary */
@@ -450,11 +452,25 @@ int main( 
            }

            break;

        case IVAS_ENC_INPUT_SBA:

            if ( ( error =

                       IVAS_ENC_ConfigureForAmbisonics(

                           hIvasEnc,

                           arg.inputFs,

                           totalBitrate,

                           arg.max_bwidth_user,

                           bandwidth,

                           arg.dtxConfig,

                           arg.inputFormatConfig.sba.order,

                           arg.inputFormatConfig.sba.isPlanar,

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

                           arg.agc,

#endif

                           arg.pca

#ifdef DEBUG_SBA_AUDIO_DUMP

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca, &numTransportChannels ) ) != IVAS_ERR_OK )

#else

            if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca ) ) != IVAS_ERR_OK )

                           ,

                           &numTransportChannels

#endif

                           ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );

                goto cleanup;
@@ -880,11 +896,13 @@ static void initArgStruct( EncArguments *arg ) 
    arg->ca_config_file = NULL;

    arg->mimeOutput = false;



#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    arg->agc = IVAS_ENC_AGC_UNDEFINED;

#else

    arg->agc = IVAS_DEFAULT_AGC;

#endif

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */

    arg->pca = false;

#ifdef DEBUG_FOA_AGC

    arg->agcBitstream = NULL;
@@ -1390,6 +1408,7 @@ static bool parseCmdlIVAS_enc( 
            arg->inputFormatConfig.stereoToMonoDownmix = true;

            i++;

        }

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

        else if ( strcmp( argv_to_upper, "-AGC" ) == 0 )

        {

            i++;
@@ -1415,6 +1434,7 @@ static bool parseCmdlIVAS_enc( 
                return false;

            }

        }

#endif

        else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"

        {

            i++;
@@ -1654,13 +1674,15 @@ static void usage_enc( void ) 
#ifdef DEBUG_SBA

    fprintf( stdout, "-tag                : Tag name for intermediate debug files\n" );

#endif

#ifdef DEBUG_AGC_ENCODER_CMD_OPTION

#ifdef AGC_ENABLE_FOR_LBR

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1).  \n" );

    fprintf( stdout, "                      By default op is 1 (activated) for bitrates between 24400 and 32000,\n" );

    fprintf( stdout, "                      otherwise it is 0 (deactivated) for all other bitrates\n" );

#else

    fprintf( stdout, "-agc op             : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated\n" );

#endif

#endif /* AGC_ENABLE_FOR_LBR */

#endif /* DEBUG_AGC_ENCODER_CMD_OPTION */



    fprintf( stdout, "-bypass mode        : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );

#ifdef DEBUGGING

apps/renderer.c

+222 −143

File changed.

Preview size limit exceeded, changes collapsed.

ci/run_scheduled_sanitizer_test.py

+2 −5
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ import subprocess 
import pathlib





DURATION = "120"

CFG = "ci_linux.json"

DURATION = "30"

CFG = "ci_linux_ltv.json"

SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]

EP_FILE = "ep_015.g192"

GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}"
@@ -48,9 +48,6 @@ def get_modes(in_format: str) -> list: 
        in_format = "MC_" + in_format + "_b"



    mode_list = [m for m in output.splitlines() if in_format in m]

    if "SBA" in in_format:

        # rate switching not implemented yet

        mode_list = [m for m in mode_list if not "_rs" in m]



    return mode_list

ci/smoke_test.sh

+2 −5
Original line number Diff line number Diff line
@@ -8,8 +8,5 @@ fi 
make clean

make all -j 8



# get all modes except SBA rate switching (which is broken currently)

list=$(./scripts/runIvasCodec.py -l | grep -v "SBA.*rs")

./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1 | tee smoke_test_output.txt



./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -m $list -U 1 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt
 
./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 | tee smoke_test_output.txt

./scripts/runIvasCodec.py -p ./scripts/config/ci_linux.json -U 1 -D="-fec 15" --decoder_only | tee smoke_test_output_plc.txt

lib_com/cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ enum{ 


#define MAX_V_MULT_MAT                  100             /* maximum array length for the function v_mult_mat() */



#define SBA_AGC_FORCE_ENABLE            1

#define SBA_AGC_FORCE_DISABLE           0

#define SBA_AGC_DEFAULT                 -1



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

 * Layers