Commit 552d2b68 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Fix merge conflicts

parent 1938ba50

apps/decoder.c

+98 −8
Original line number Diff line number Diff line
@@ -168,8 +168,12 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, Head 
static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

#ifdef DEBUGGING

#ifdef VARIABLE_SPEED_DECODING

#ifdef EXTERNAL_ORIENTATIONS

static ivas_error decodeVariableSpeed( DecArguments arg, BS_READER_HANDLE hBsReader, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#else

static ivas_error decodeVariableSpeed( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, HeadRotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec );

#endif

#endif

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );
@@ -732,17 +736,21 @@ int main( 
#ifdef DEBUGGING

    else if ( arg.variableSpeedMode )

    {

        error = decodeVariableSpeed( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec );

        error = decodeVariableSpeed( arg, hBsReader, headRotReader,

#ifdef EXTERNAL_ORIENTATIONS

                                     externalOrientationFileReader,

#endif

                                     refRotReader, referenceVectorReader, hIvasDec );

    }

#endif

#endif

    else

    {

        error = decodeG192( arg, hBsReader, headRotReader,

#ifdef EXTERNAL_ORIENTATIONS

        error = decodeG192( arg, hBsReader, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf );

#else

        error = decodeG192( arg, hBsReader, headRotReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf );

                            externalOrientationFileReader,

#endif

                            refRotReader, referenceVectorReader, hIvasDec, pcmBuf );

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -2668,8 +2676,14 @@ cleanup: 
static ivas_error decodeVariableSpeed(

    DecArguments arg,

    BS_READER_HANDLE hBsReader,

#ifdef EXTERNAL_ORIENTATIONS

    RotFileReader *headRotReader,

    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

#else

    HeadRotFileReader *headRotReader,

    HeadRotFileReader *refRotReader,

#endif

    Vector3PairFileReader *referenceVectorReader,

    IVAS_DEC_HANDLE hIvasDec )
@@ -2773,7 +2787,12 @@ static ivas_error decodeVariableSpeed( 
            IVAS_QUATERNION quaternion;

            if ( ( error = HeadRotationFileReading( refRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) );

                fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ),

#ifdef EXTERNAL_ORIENTATIONS

                         RotationFileReader_getFilePath( refRotReader ) );

#else

                         HeadRotationFileReader_getFilePath( refRotReader ) );

#endif

                goto cleanup;

            }
@@ -2793,7 +2812,12 @@ static ivas_error decodeVariableSpeed( 
            {

                if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) );

                    fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),

#ifdef EXTERNAL_ORIENTATIONS

                             RotationFileReader_getFilePath( headRotReader ) );

#else

                             HeadRotationFileReader_getFilePath( headRotReader ) );

#endif

                    goto cleanup;

                }

            }
@@ -2805,6 +2829,34 @@ static ivas_error decodeVariableSpeed( 
            }

        }



#ifdef EXTERNAL_ORIENTATIONS

        if ( arg.enableExternalOrientation )

        {

            IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableHeadRotation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableExternalOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];



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

            {



                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError %s while reading external orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),

                             RotationFileReader_getFilePath( externalOrientationFileReader ) );

                    goto cleanup;

                }

            }



            if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions, enableHeadRotation, enableExternalOrientation, enableRotationInterpolation, numFramesToTargetOrientation ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_DEC_FeedExternalOrientationData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                goto cleanup;

            }

        }

#endif



        /* decode and get samples */

        do

        {
@@ -3026,7 +3078,12 @@ static ivas_error decodeVariableSpeed( 
            IVAS_QUATERNION quaternion;

            if ( ( error = HeadRotationFileReading( refRotReader, &quaternion, NULL ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( refRotReader ) );

                fprintf( stderr, "\nError %s while reading reference rotation from %s\n", IVAS_DEC_GetErrorMessage( error ),

#ifdef EXTERNAL_ORIENTATIONS

                         RotationFileReader_getFilePath( refRotReader ) );

#else

                         HeadRotationFileReader_getFilePath( refRotReader ) );

#endif

                goto cleanup;

            }
@@ -3045,7 +3102,12 @@ static ivas_error decodeVariableSpeed( 
            {

                if ( ( error = HeadRotationFileReading( headRotReader, &Quaternions[i], &Pos[i] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ), HeadRotationFileReader_getFilePath( headRotReader ) );

                    fprintf( stderr, "\nError %s while reading head orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),

#ifdef EXTERNAL_ORIENTATIONS

                             RotationFileReader_getFilePath( headRotReader ) );

#else

                             HeadRotationFileReader_getFilePath( headRotReader ) );

#endif

                    goto cleanup;

                }

            }
@@ -3057,6 +3119,34 @@ static ivas_error decodeVariableSpeed( 
            }

        }



#ifdef EXTERNAL_ORIENTATIONS

        if ( arg.enableExternalOrientation )

        {

            IVAS_QUATERNION Quaternions[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableHeadRotation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableExternalOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int8_t enableRotationInterpolation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];

            int16_t numFramesToTargetOrientation[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES];



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

            {



                if ( ( error = ExternalOrientationFileReading( externalOrientationFileReader, &Quaternions[i], &enableHeadRotation[i], &enableExternalOrientation[i], &enableRotationInterpolation[i], &numFramesToTargetOrientation[i] ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nError %s while reading external orientation from %s\n", IVAS_DEC_GetErrorMessage( error ),

                             RotationFileReader_getFilePath( externalOrientationFileReader ) );

                    goto cleanup;

                }

            }



            if ( ( error = IVAS_DEC_FeedExternalOrientationData( hIvasDec, Quaternions, enableHeadRotation, enableExternalOrientation, enableRotationInterpolation, numFramesToTargetOrientation ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_DEC_FeedExternalOrientationData failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                goto cleanup;

            }

        }

#endif



        /* decode and get samples */

        if ( ( error = IVAS_DEC_VoIP_Flush( hIvasDec, nOutSamples, pcmBuf, &nSamplesAvailableNext, &nSamplesFlushed ) ) != IVAS_ERR_OK )

        {

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -1842,12 +1842,12 @@ static void parseOption( 
            assert( numOptionValues == 1 );

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

            break;

#endif

#ifdef EXTERNAL_ORIENTATIONS

        case CmdLnOptionId_exteriorOrientationFile:

            assert( numOptionValues == 1 );

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

            break;

#endif

        case CmdLnOptionId_customHrtfFile:

            assert( numOptionValues == 1 );

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

lib_com/ivas_error.h

+4 −0
Original line number Diff line number Diff line
@@ -235,6 +235,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Wrong mode";

        case IVAS_ERR_HEAD_ROTATION_NOT_SUPPORTED:

            return "Head rotation not supported";

#ifdef EXTERNAL_ORIENTATIONS

        case IVAS_ERR_EXT_ORIENTATION_NOT_SUPPORTED:

            return "External orientation not supported";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_INPUT_FORMAT:

lib_dec/ivas_binRenderer_internal.c

+40 −25
Original line number Diff line number Diff line
@@ -1063,13 +1063,13 @@ void ivas_binaural_cldfb( 
        /* Implement binaural rendering */

#ifdef JBM_TSM_ON_TCS

#ifdef EXTERNAL_ORIENTATIONS

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, JBM_CLDFB_SLOTS_IN_SUBFRAME, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, subframeIdx, JBM_CLDFB_SLOTS_IN_SUBFRAME, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#else

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, JBM_CLDFB_SLOTS_IN_SUBFRAME, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#endif

#else

#ifdef EXTERNAL_ORIENTATIONS

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, subframeIdx, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#else

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#endif
@@ -1166,9 +1166,17 @@ void ivas_binaural_cldfb_sf( 


        /* Implement binaural rendering */

#ifdef JBM_TSM_ON_TCS

#ifdef EXTERNAL_ORIENTATIONS

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, subframeIdx, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#else

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hTcBuffer->subframe_nbslots[subframeIdx], Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#endif

#else

#ifdef EXTERNAL_ORIENTATIONS

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, st_ivas->hCombinedOrientationData, subframeIdx, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#else

        ivas_binRenderer( st_ivas->hBinRenderer, st_ivas->hHeadTrackData, Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural, Cldfb_RealBuffer, Cldfb_ImagBuffer );

#endif

#endif



        /* Implement CLDFB synthesis */
@@ -1237,64 +1245,71 @@ void ivas_binRenderer( 
        }

    }



#ifdef EXTERNAL_ORIENTATIONS

    /* Head rotation in HOA3 or CICPx */

    if ( hHeadTrackData && hCombinedOrientationData != NULL && hCombinedOrientationData->enableCombinedOrientation[subframe_idx] && hBinRenderer->rotInCldfb )

    if ( hHeadTrackData

#ifdef EXTERNAL_ORIENTATIONS

         && hCombinedOrientationData != NULL && hCombinedOrientationData->enableCombinedOrientation[subframe_idx]

#else

         && hHeadTrackData->num_quaternions >= 0

#endif

         && hBinRenderer->rotInCldfb )

    {

        if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )

        {

            /* Rotation in SHD (HOA3) */

            if ( hHeadTrackData->shd_rot_max_order == -1 )

            {

#ifdef EXTERNAL_ORIENTATIONS

#ifdef JBM_TSM_ON_TCS

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hCombinedOrientationData->Rmat[subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );

#else

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hCombinedOrientationData->Rmat[subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, 3 );

            }

            else if ( hHeadTrackData->shd_rot_max_order > 0 )

            {

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hCombinedOrientationData->Rmat[subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, hHeadTrackData->shd_rot_max_order );

            }

        }

        else

        {

            /* Rotation in SD (CICPx) */

            rotateFrame_sd_cldfb( hCombinedOrientationData->Rmat[subframe_idx], RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, hBinRenderer->conv_band );

        }

    }

#endif

#else

    /* Head rotation in HOA3 or CICPx */

    if ( hHeadTrackData && hHeadTrackData->num_quaternions >= 0 && hBinRenderer->rotInCldfb )

    {

        if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 )

        {

            /* Rotation in SHD (HOA3) */

            if ( hHeadTrackData->shd_rot_max_order == -1 )

            {

                QuatToRotMat( hHeadTrackData->Quaternions[hHeadTrackData->num_quaternions++], hHeadTrackData->Rmat );

#ifdef JBM_TSM_ON_TCS

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );

#else

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, 3 );

#endif

#endif

            }

            else if ( hHeadTrackData->shd_rot_max_order > 0 )

            {



#ifdef EXTERNAL_ORIENTATIONS

#ifdef JBM_TSM_ON_TCS

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hCombinedOrientationData->Rmat[subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hHeadTrackData->shd_rot_max_order );

#else

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hCombinedOrientationData->Rmat[subframe_idx], hBinRenderer->hInputSetup->nchan_out_woLFE, hHeadTrackData->shd_rot_max_order );

#endif

#else

#ifdef JBM_TSM_ON_TCS

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hHeadTrackData->shd_rot_max_order );

#else

                rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, hHeadTrackData->Rmat, hBinRenderer->hInputSetup->nchan_out_woLFE, hHeadTrackData->shd_rot_max_order );

#endif

#endif

            }

        }

        else

        {

            /* Rotation in SD (CICPx) */

#ifdef EXTERNAL_ORIENTATIONS

#ifdef JBM_TSM_ON_TCS

            rotateFrame_sd_cldfb( hCombinedOrientationData->Rmat[subframe_idx], RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );

#else

            rotateFrame_sd_cldfb( hCombinedOrientationData->Rmat[subframe_idx], RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, hBinRenderer->conv_band );

#endif

#else

#ifdef JBM_TSM_ON_TCS

            rotateFrame_sd_cldfb( hHeadTrackData, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, numTimeSlots, hBinRenderer->conv_band );

#else

            rotateFrame_sd_cldfb( hHeadTrackData, RealBuffer, ImagBuffer, hBinRenderer->hInputSetup, hBinRenderer->hEFAPdata, hBinRenderer->conv_band );

#endif

#endif

        }

    }

#endif



    /* HOA decoding to CICP19 if needed*/

    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 )

lib_dec/ivas_dec.c

+15 −2
Original line number Diff line number Diff line
@@ -685,9 +685,22 @@ ivas_error ivas_dec( 
            if ( st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV || st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM )

            {

#ifdef JBM_TSM_ON_TCS

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hHeadTrackData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,

#ifdef EXTERNAL_ORIENTATIONS

                                                       st_ivas->hCombinedOrientationData,

#else

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig, st_ivas->hHeadTrackData, &st_ivas->hIntSetup, st_ivas->hEFAPdata, output, output_Fs ) ) != IVAS_ERR_OK )

                                                       st_ivas->hHeadTrackData,

#endif

                                                       &st_ivas->hIntSetup, st_ivas->hEFAPdata, p_output, output_Fs ) ) != IVAS_ERR_OK )

#else

                if ( ( error = ivas_rend_crendProcess( st_ivas->hCrendWrapper, st_ivas->intern_config, st_ivas->hOutSetup.output_config, st_ivas->hDecoderConfig,

#ifdef EXTERNAL_ORIENTATIONS

                                                       st_ivas->hCombinedOrientationData,

#else

                                                       st_ivas->hHeadTrackData,

#endif

                                                       &st_ivas->hIntSetup, st_ivas->hEFAPdata, output, output_Fs ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }