Commit ea838dcb authored by bayers's avatar bayers
Browse files

address some comments in the MR, add debug switch... 

address some comments in the MR, add debug switch DEBUG_SIMULATE_EXTORIENTATION_MAIN_FOR_BE for BE testing within the branch
parent 6f20b41a

apps/decoder.c

+5 −0
Original line number Diff line number Diff line
@@ -1406,6 +1406,9 @@ static bool parseCmdlIVAS_dec( 
        else if ( strcmp( argv_to_upper, "-EXOF" ) == 0 )

        {

            arg->enableExternalOrientation = true;

#ifdef API_5MS_BASELINE

            arg->enable5ms = true;

#endif

            i++;



            if ( argc - i <= 4 || argv[i][0] == '-' )
@@ -1842,7 +1845,9 @@ static ivas_error initOnFirstGoodFrame( 
            splitRendBitsZero.buf_len = 0;

            splitRendBitsZero.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

            splitRendBitsZero.pose_correction = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

#ifdef API_5MS

            splitRendBitsZero.codec_frame_size_ms = 20;

#endif

            if ( split_rend_write_bitstream_to_file( *hSplitRendFileReadWrite, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written,

                                                     -1, IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE

#ifdef API_5MS

apps/renderer.c

+2 −0
Original line number Diff line number Diff line
@@ -1483,7 +1483,9 @@ int main( 
    bitsBuffer.config.bufLenInBytes = bitsBufferSize;

    bitsBuffer.config.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

    bitsBuffer.config.poseCorrection = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

#ifdef API_5MS

    bitsBuffer.config.codec_frame_size_ms = 20;

#endif

#else

    inFloatBuffer = malloc( inBufferSize * sizeof( float ) );

    outInt16Buffer = malloc( outBufferSize * sizeof( int16_t ) );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ 
#define DEBUG_JBM_CMD_OPTION                    /* ability for telling the decoder the frontend fetch size and to not delay compensate for bad frames at the beginning */

#define VARIABLE_SPEED_DECODING                 /* variable speed decoding employing the JBM functioniality; move to DEBUGGING after build for disabled is fixed */

#define DISABLE_LIMITER                         /* disable the limiter to aid BE debugging */

#define DEBUG_SIMULATE_EXTORIENTATION_MAIN_FOR_BE /* simulate the problem discussed in*/

#define DEBUG_IND_LIST_MEMORY                   /* raise assert() when ind_list[] runs out of memory */



/*Split Rendering Debug switches*/

lib_dec/ivas_output_config.c

+0 −11
Original line number Diff line number Diff line
@@ -555,16 +555,6 @@ void ivas_set_split_rend_setup( IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, IVAS 
    if ( ( hCombinedOrientationData != NULL ) && ( hSplitBinRend->splitrend.multiBinPoseData.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_CLDFB ) )

    {

        int16_t i, j;

#ifdef API_5MS

        hCombinedOrientationData->Quaternion = hCombinedOrientationData->Quaternion;

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

        {

            for ( j = 0; j < 3; j++ )

            {

                hCombinedOrientationData->Rmat[i][j] = hCombinedOrientationData->Rmat[i][j];

            }

        }

#else

        int16_t sf;

        for ( sf = 1; sf < MAX_PARAM_SPATIAL_SUBFRAMES; sf++ )

        {
@@ -577,7 +567,6 @@ void ivas_set_split_rend_setup( IVAS_DEC_SPLIT_REND_WRAPPER *hSplitBinRend, IVAS 
                }

            }

        }

#endif

    }

#endif

    return;

lib_rend/ivas_rotation.c

+4 −5
Original line number Diff line number Diff line
@@ -1277,13 +1277,8 @@ ivas_error combine_external_and_head_orientations( 
#endif

    {

        /* Head rotation only */

#ifdef API_5MS

#ifdef API_5MS

        hCombinedOrientationData->Quaternion = *headRotQuaternion;

#else

        hCombinedOrientationData->Quaternion = *headRotQuaternions;

#endif



#else

        if ( numHeadRotQuaternions >= 0 )

        {
@@ -1560,6 +1555,9 @@ ivas_error combine_external_and_head_orientations( 
    if ( hExtOrientationData != NULL )

    {

#ifdef API_5MS

#ifdef DEBUG_SIMULATE_EXTORIENTATION_MAIN_FOR_BE

        hCombinedOrientationData->Quaternion_prev_extOrientation = hExtOrientationData->Quaternion;

#else

        if ( hExtOrientationData->enableExternalOrientation > 0 )

        {

            hCombinedOrientationData->Quaternion_prev_extOrientation = hExtOrientationData->Quaternion;
@@ -1568,6 +1566,7 @@ ivas_error combine_external_and_head_orientations( 
        {

            hCombinedOrientationData->Quaternion_prev_extOrientation = identity;

        }

#endif

#elif defined FIX_570_SF_EXT_ORIENTATION

        if ( hExtOrientationData->enableExternalOrientation[MAX_PARAM_SPATIAL_SUBFRAMES - 1] > 0 )

        {