Commit c66e4854 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into 2179-basop-non-be-difference-in-basop-of-be-port-376
parents d3d8bb5b 6c176696

Workspace_msvc/lib_rend.vcxproj

+3 −1
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ 
    </Lib>

  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c" />
@@ -175,6 +176,7 @@ 
    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_td_ring_buffer_fx.c" />

    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c" />

    <ClCompile Include="..\lib_rend\lib_rend_fx.c" />

  </ItemGroup>

Workspace_msvc/lib_rend.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -109,6 +109,9 @@ 
    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_cldfb_ring_buffer.c">

      <Filter>rend_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c">

      <Filter>rend_c</Filter>

    </ClCompile>

apps/decoder.c

+158 −19
Original line number Diff line number Diff line
@@ -158,7 +158,11 @@ typedef struct 
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtf, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );
@@ -632,7 +636,11 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );

#else

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );

#endif

    }

    else

    {
@@ -1701,7 +1709,11 @@ static ivas_error initOnFirstGoodFrame( 


    for ( int16_t i = 0; i < numInitialBadFrames; ++i )

    {

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        if ( isSplitRend )

#else

        if ( *splitRendWriter != NULL )

#endif

        {

            ISAR_SPLIT_REND_BITS_DATA splitRendBitsZero;

            splitRendBitsZero.bits_buf = NULL;
@@ -1719,7 +1731,12 @@ static ivas_error initOnFirstGoodFrame( 
                return error;

            }

        }



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

        if ( !isSplitCoded )

#else

        else

#endif

        {

            if ( *pRemainingDelayNumSamples < *numOutSamples )

            {
@@ -1919,6 +1936,14 @@ static ivas_error decodeG192( 
        return error;

    }



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    if ( !isSplitRend )

    {

        /* Ensure split rendering output struct is not used when not outputting to a split rendering output configuration */

        splitRendBits = NULL;

    }

#endif



    if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );
@@ -2180,7 +2205,11 @@ static ivas_error decodeG192( 
                }



                /* decode transport channels, do TSM and feed to renderer */

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, splitRendBits ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_GetSamplesDecoder( hIvasDec, isSplitRend, splitRendBits ) ) != IVAS_ERR_OK )

#endif

                {

                    return error;

                }
@@ -2622,6 +2651,9 @@ static ivas_error decodeVoIP( 
    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#endif

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

{
@@ -2671,6 +2703,29 @@ static ivas_error decodeVoIP( 
    bool parametersAvailableForEditing = false;

    uint16_t nSamplesRendered;



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    SplitFileReadWrite *splitRendWriter = NULL;

    int16_t isSplitRend, isSplitCoded;



    if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_enabled, code: %d\n", error );

        return error;

    }



    if ( !isSplitRend )

    {

        /* Ensure split rendering output struct is not used when not outputting to a split rendering format */

        splitRendBits = NULL;

    }



    if ( ( error = IVAS_DEC_is_split_rendering_coded_out( hIvasDec, &isSplitCoded ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nError in IVAS_DEC_is_split_rendering_coded_out, code: %d\n", error );

        return error;

    }

#endif



    vec_pos_update = 0;

    if ( ( error = IVAS_DEC_GetRenderFramesizeMs( hIvasDec, &systemTimeInc_ms ) ) != IVAS_ERR_OK )

    {
@@ -2962,6 +3017,22 @@ static ivas_error decodeVoIP( 
        /* decode and get samples */

        while ( nSamplesRendered < nOutSamples )

        {

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            if ( isSplitRend )

            {

#ifdef SUPPORT_JBM_TRACEFILE

                if ( ( error = IVAS_DEC_VoIP_GetSplitBinauralBitstream( hIvasDec, (void *) pcmBuf, splitRendBits, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else

                if ( ( error = IVAS_DEC_VoIP_GetSplitBinauralBitstream( hIvasDec, (void *) pcmBuf, splitRendBits, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#endif

                {

                    fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSplitBinauralBitstream: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

            }

            else

            {

#endif

#ifdef SUPPORT_JBM_TRACEFILE

                if ( ( error = IVAS_DEC_VoIP_GetSamples( hIvasDec, nOutSamples, (void *) pcmBuf, writeJbmTraceFileFrameWrapper, jbmTraceWriter, &bitstreamReadDone, &nSamplesRendered, &parametersAvailableForEditing, systemTime_ms ) ) != IVAS_ERR_OK )

#else
@@ -2971,6 +3042,9 @@ static ivas_error decodeVoIP( 
                    fprintf( stderr, "\nError in IVAS_DEC_VoIP_GetSamples: %s\n", IVAS_DEC_GetErrorMessage( error ) );

                    goto cleanup;

                }

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            }

#endif



            if ( bitstreamReadDone == true )

            {
@@ -3050,9 +3124,15 @@ static ivas_error decodeVoIP( 
            /* Once good frame decoded, catch up */

            if ( decodedGoodFrame )

            {

#ifndef FIX_1119_SPLIT_RENDERING_VOIP

                SplitFileReadWrite *splitRendWriter = NULL;



#endif

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, &vec_pos_len, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,

#else

                if ( ( error = initOnFirstGoodFrame( hIvasDec, arg, numInitialBadFrames, &nOutSamples, NULL, delayNumSamples_orig, &delayNumSamples, &delayTimeScale,

#endif

                                                     &bsFormat, &afWriter, &masaWriter, ismWriters, &nOutChannels, &numObj, &splitRendWriter ) ) != IVAS_ERR_OK )

                {

                    goto cleanup;
@@ -3067,6 +3147,19 @@ static ivas_error decodeVoIP( 
        /* Write current frame */

        if ( decodedGoodFrame )

        {

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            if ( isSplitRend )

            {

                if ( split_rend_write_bitstream_to_file( splitRendWriter, splitRendBits->bits_buf, &splitRendBits->bits_read, &splitRendBits->bits_written ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nUnable to write to bitstream file!\n" );

                    goto cleanup;

                }

            }



            if ( !isSplitCoded )

            {

#endif

                if ( delayNumSamples < nOutSamples )

                {

                    if ( ( error = AudioFileWriter_write( afWriter, &pcmBuf[delayNumSamples * nOutChannels], nOutSamples * nOutChannels - ( delayNumSamples * nOutChannels ) ) ) != IVAS_ERR_OK )
@@ -3080,6 +3173,9 @@ static ivas_error decodeVoIP( 
                {

                    delayNumSamples -= nOutSamples;

                }

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

            }

#endif



            /* Write ISM metadata to external file(s) */

            if ( decodedGoodFrame && arg.outputConfig == IVAS_AUDIO_CONFIG_EXTERNAL )
@@ -3167,7 +3263,11 @@ static ivas_error decodeVoIP( 
        goto cleanup;

    }



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    if ( nSamplesFlushed && !isSplitCoded )

#else

    if ( nSamplesFlushed )

#endif

    {

        /* Write current frame */

        if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, nSamplesFlushed * nOutChannels ) ) != IVAS_ERR_OK )
@@ -3238,11 +3338,19 @@ static ivas_error decodeVoIP( 
     *------------------------------------------------------------------------------------------*/



    memset( pcmBuf, 0, delayNumSamples_orig[0] * nOutChannels * sizeof( int16_t ) );



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    if ( afWriter != NULL )

    {

#endif

        if ( ( error = AudioFileWriter_write( afWriter, pcmBuf, delayNumSamples_orig[0] * nOutChannels ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError writing output file: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    }

#endif



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

     * Printouts after decoding has finished
@@ -3287,6 +3395,9 @@ cleanup: 


    EVS_RTPDUMP_DEPACKER_close( &rtpdumpDepacker );

    AudioFileWriter_close( &afWriter );

#ifdef FIX_1119_SPLIT_RENDERING_VOIP

    split_rend_reader_writer_close( &splitRendWriter );

#endif

    JbmOffsetFileWriter_close( &jbmOffsetWriter );

#ifdef SUPPORT_JBM_TRACEFILE

    JbmTraceFileWriter_close( &jbmTraceWriter );
@@ -3337,7 +3448,11 @@ static void do_object_editing_fx( 


        if ( readInfo->bg_gain_edited )

        {

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

            editableParameters->gain_bed_fx = (Word32) ( readInfo->bg_gain * 536870912 ); /* Q29 */

#else

            editableParameters->gain_bed_fx = (Word32) readInfo->bg_gain * 536870912;                                                                                                                                                       /* Q29 */

#endif

        }



        for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
@@ -3350,11 +3465,19 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_azi_relative[obj_idx] )

                    {

                        /* azimuth: apply relative edit + wrap */

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = ( ( editableParameters->ism_metadata[obj_idx].azimuth_fx + (Word32) ( readInfo->obj_azi[obj_idx] * 4194304 ) + 2264924160 ) % 1509949440 ) - 754974720; /* Q22 */

#else

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = ( ( editableParameters->ism_metadata[obj_idx].azimuth_fx + (Word32) readInfo->obj_azi[obj_idx] * 4194304 + 2264924160 ) % 1509949440 ) - 754974720;          /* Q22 */

#endif

                    }

                    else

                    {

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = (Word32) ( readInfo->obj_azi[obj_idx] * 4194304 ); /* Q22 */

#else

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = (Word32) readInfo->obj_azi[obj_idx] * 4194304;                                                                                                               /* Q22 */

#endif

                    }

                }

                if ( readInfo->obj_ele_edited[obj_idx] )
@@ -3362,11 +3485,19 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_ele_relative[obj_idx] )

                    {

                        /* elevation: apply relative edit + saturation */

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                        editableParameters->ism_metadata[obj_idx].elevation_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].elevation_fx + (Word32) ( readInfo->obj_ele[obj_idx] * 4194304 ), 377487360 ), -377487360 ); /* Q22 */

#else

                        editableParameters->ism_metadata[obj_idx].elevation_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].elevation_fx + (Word32) readInfo->obj_ele[obj_idx] * 4194304, 377487360 ), -377487360 );           /* Q22 */

#endif

                    }

                    else

                    {

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                        editableParameters->ism_metadata[obj_idx].elevation_fx = (Word32) ( readInfo->obj_ele[obj_idx] * 4194304 ); /* Q22 */

#else

                        editableParameters->ism_metadata[obj_idx].elevation_fx = (Word32) readInfo->obj_ele[obj_idx] * 4194304;                                                                                                             /* Q22 */

#endif

                    }

                }

            }
@@ -3378,14 +3509,22 @@ static void do_object_editing_fx( 
                {

                    /* gain: apply relative edit + saturation */

#ifdef FIX_2140_OBJECT_EDITING_SANITIZER_ISSUES

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) ( readInfo->obj_gain[obj_idx] * 536870912 ) ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29*Q29 -> Q27 shift back to Q29 */

#else

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( L_shl_sat( Mpy_32_32( editableParameters->ism_metadata[obj_idx].gain_fx, (Word32) readInfo->obj_gain[obj_idx] * 536870912 ), 2 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29*Q29 -> Q27 shift back to Q29 */

#endif

#else

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */

#endif

                }

                else

                {

#ifdef FIX_2178_FL_TO_FX_WITH_OBJ_EDIT_FILE_INTERFACE

                    editableParameters->ism_metadata[obj_idx].gain_fx = (Word32) ( readInfo->obj_gain[obj_idx] * 536870912 ); /* Q29 */

#else

                    editableParameters->ism_metadata[obj_idx].gain_fx = (Word32) readInfo->obj_gain[obj_idx] * 536870912;                                                                                                                   /* Q29 */

#endif

                }

            }

        }

apps/isar_post_rend.c

+13 −0
Original line number Diff line number Diff line
@@ -1109,6 +1109,19 @@ int main( 
                    fprintf( stderr, "\nISAR_POST_REND_FeedSplitBinauralBitstream failed: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }



#ifdef FIX_1119_SPLIT_RENDERING_VOIP

                /* Set BFI if frame is empty */

                int16_t frameEmpty = (int16_t) ( bitsBuffer.config.bitsWritten == 0 );

                if ( frameEmpty )

                {

                    if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, 1 ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );

                        goto cleanup;

                    }

                }

#endif

            }

        }

apps/renderer.c

+70 −56

File changed.

Preview size limit exceeded, changes collapsed.