Commit 8ff889f8 authored by vaclav's avatar vaclav
Browse files

Merge branch 'FIX_FMSW_DEC' into 'main' 

[non-BE] Fix format switching in VoIP

See merge request !2970
parents a90fd817 bf0a7071

apps/decoder.c

+48 −2
Original line number Diff line number Diff line
@@ -164,10 +164,16 @@ static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS 
#else

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 );

#endif

#ifdef FIX_FMSW_DEC

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 *phIvasDec, int16_t *pcmBuf );

#else

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_RENDER_CONFIG_DATA *renderConfig, IVAS_DEC_HANDLE *phIvasDec, 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 );

#ifndef FIX_FMSW_DEC

static ivas_error restartDecoder( IVAS_DEC_HANDLE *phIvasDec, const IVAS_DEC_MODE decMode, DecArguments *arg, IVAS_RENDER_CONFIG_DATA *renderConfig, IVAS_CUSTOM_LS_DATA *hLsCustomData );

#endif





/*------------------------------------------------------------------------------------------*
@@ -668,7 +674,11 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_FMSW_DEC

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

#else

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

#endif

    }

    else

    {
@@ -2319,6 +2329,13 @@ static ivas_error decodeG192( 


                if ( restartNeeded )

                {

#ifdef FIX_FMSW_DEC

                    if ( ( error = IVAS_DEC_Restart( hIvasDec, IVAS_DEC_MODE_IVAS ) ) != IVAS_ERR_OK ) /* note: only switching within IVAS formats is supported in G.192 */

                    {

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

                        goto cleanup;

                    }

#else

                    IVAS_DEC_BS_FORMAT tempFormat;

                    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempFormat ) ) != IVAS_ERR_OK )

                    {
@@ -2339,6 +2356,7 @@ static ivas_error decodeG192( 
                        goto cleanup;

                    }

                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

                }

#endif
@@ -2818,7 +2836,9 @@ static ivas_error decodeVoIP( 
    Vector3PairFileReader *referenceVectorReader,

    ObjectEditFileReader *objectEditFileReader,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

#ifndef FIX_FMSW_DEC

    IVAS_RENDER_CONFIG_DATA *renderConfig,

#endif

    IVAS_DEC_HANDLE *phIvasDec,

    int16_t *pcmBuf )

{
@@ -2974,6 +2994,15 @@ static ivas_error decodeVoIP( 


        /* EVS RTP payload format has timescale 16000, JBM uses 1000 internally */

        rtpTimeStamp = rtpTimeStamp / 16;



#ifdef FIX_FMSW_DEC_2

        arg.decMode = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

        if ( ( error = IVAS_DEC_Restart( hIvasDec, arg.decMode ) ) != IVAS_ERR_OK ) /* note: when the RTP bitstream starts with EVS, do the restart */

        {

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

            goto cleanup;

        }

#endif

    }

    if ( error != IVAS_ERR_OK )

    {
@@ -3007,6 +3036,14 @@ static ivas_error decodeVoIP( 
        /* restart decoder in case of format switching */

        if ( ivasRtp.restartNeeded )

        {

#ifdef FIX_FMSW_DEC

            arg.decMode = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

            if ( ( error = IVAS_DEC_Restart( hIvasDec, arg.decMode ) ) != IVAS_ERR_OK ) /* note: switching between EVS and IVAS is supported in RTP */

            {

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

                goto cleanup;

            }

#else

            IVAS_DEC_MODE newDecModeInPacket = ( ivasRtp.codecId == IVAS_RTP_EVS ) ? IVAS_DEC_MODE_EVS : IVAS_DEC_MODE_IVAS;

            if ( ( error = restartDecoder(

                       &hIvasDec,
@@ -3021,6 +3058,7 @@ static ivas_error decodeVoIP( 
            }



            *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

            ivasRtp.restartNeeded = false;

            bitstreamReadDone = false;

            parametersAvailableForEditing = false;
@@ -3252,6 +3290,13 @@ static ivas_error decodeVoIP( 


                if ( restartNeeded )

                {

#ifdef FIX_FMSW_DEC

                    if ( ( error = IVAS_DEC_Restart( hIvasDec, IVAS_DEC_MODE_IVAS ) ) != IVAS_ERR_OK ) /* note: only switching within IVAS formats is supported in non-RTP VoIP */

                    {

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

                        goto cleanup;

                    }

#else

                    IVAS_DEC_BS_FORMAT tempBsFormat;

                    if ( ( error = IVAS_DEC_GetFormat( hIvasDec, &tempBsFormat ) ) != IVAS_ERR_OK )

                    {
@@ -3273,6 +3318,7 @@ static ivas_error decodeVoIP( 
                    }



                    *phIvasDec = hIvasDec; /* Update for main()' s free */

#endif

                    bitstreamReadDone = false;

                    parametersAvailableForEditing = false;

                }
@@ -3965,7 +4011,7 @@ static ivas_error load_hrtf_from_file( 
    return IVAS_ERR_OK;

}





#ifndef FIX_FMSW_DEC

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

 * restartDecoder()

 *
@@ -4070,5 +4116,5 @@ cleanup: 


    return error;

}



#endif

#undef WMC_TOOL_SKIP

apps/encoder.c

+26 −2
Original line number Diff line number Diff line
@@ -254,6 +254,7 @@ int main( 
        fprintf( stderr, "Opening IVAS encoder failed: %s\n", IVAS_ENC_GetErrorMessage( error ) );

        goto cleanup;

    }



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

     * Open output bitstream file

     *------------------------------------------------------------------------------------------*/
@@ -364,6 +365,28 @@ int main( 
        }

    }



#ifdef FIX_FMSW_DEC

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

     * Open remote requests file for rtp packing (E-bytes)

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



    if ( arg.requestsFileName != NULL )

    {

        if ( !arg.rtpdumpOutput )

        {

            fprintf( stderr, "\nError: RTP requests file can be used with rtpdump output only.\n\n" );

            usage_enc();

            goto cleanup;

        }



        if ( ( error = RequestsFileReader_open( arg.requestsFileName, &requestsFileReader ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nError: Can't open requests file %s \n\n", arg.requestsFileName );

            goto cleanup;

        }

    }

#endif



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

     * Handle Channel-aware mode

     *------------------------------------------------------------------------------------------*/
@@ -661,6 +684,7 @@ int main( 
        }

    }



#ifndef FIX_FMSW_DEC

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

     * Open remote requests file for rtp packing (E-bytes)

     *------------------------------------------------------------------------------------------*/
@@ -672,7 +696,7 @@ int main( 
            goto cleanup;

        }

    }



#endif

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

     * Run the encoder

     *------------------------------------------------------------------------------------------*/
@@ -2133,9 +2157,9 @@ static void usage_enc( void ) 
    fprintf( stdout, "                      bitstream frames into TS26.253 Annex A IVAS RTP Payload Format packets and \n" );

    fprintf( stdout, "                      writes those to the output file. In EVS mono operating mode, TS26.445 Annex A.2.2 \n" );

    fprintf( stdout, "                      EVS RTP Payload Format is used. Optional N represents number of frames per RTP packet\n" );

    fprintf( stdout, "-requests           : Remote requests file, Only used with rtpdump output.\n" );

    fprintf( stdout, "-scene_orientation  : Scene orientation trajectory file. Only used with rtpdump output.\n" );

    fprintf( stdout, "-device_orientation : Device orientation trajectory file. Only used with rtpdump output.\n" );

    fprintf( stdout, "-requests           : Remote requests file, Only used with rtpdump output.\n" );



    fprintf( stdout, "\n" );

lib_com/ivas_prot_fx.h

+6 −1
Original line number Diff line number Diff line
@@ -2075,7 +2075,11 @@ void destroy_core_dec_fx( 
);



void ivas_destroy_dec_fx(

#ifdef FIX_FMSW_DEC

    Decoder_Struct **st_ivas                                    /* i/o: IVAS decoder structure                      */

#else

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

#endif

);



ivas_error ivas_ism_dec_config_fx(
@@ -3730,10 +3734,11 @@ Word16 getNumChanSynthesis( 
    Decoder_Struct *st_ivas                                     /* i  : IVAS decoder structure                      */

);



#ifndef FIX_FMSW_DEC

void ivas_destroy_dec_fx(

    Decoder_Struct *st_ivas                                     /* i/o: IVAS decoder structure                      */

);



#endif

ivas_error ivas_core_dec_fx(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                      */

    SCE_DEC_HANDLE hSCE,                                        /* i/o: SCE decoder structure                       */

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ 
#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC        /* VA : Basop issue 2547: Align conditions in core sw dec */

#define FIX_2547_ALIGN_CONDITIONS_IN_CORE_SW_DEC_EVS    /* VA : Basop issue 2547: Align conditions in core sw dec, condition that could affect EVS as well, but adapted to keep EVS BE */

#define FIX_BASOP_2548_ProcessIGF_fx_PREDICTIONGAIN     /* FhG: fixes obvious bug for IVAS path. For EVS path, issue is still not resolved */

#define FIX_FMSW_DEC                                    /* float issue 1542: fix JBM issue in format switching */

#define FIX_FMSW_DEC_2                                  /* float issue 1575: fix crash for format switching when bitsream starts with EVS */



/* ##################### End NON-BE switches ########################### */

lib_dec/ivas_init_dec_fx.c

+112 −26
Original line number Diff line number Diff line
@@ -1572,7 +1572,12 @@ ivas_error ivas_init_decoder_front( 
     * Allocate and initialize Custom loudspeaker layout handle

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



#ifdef FIX_FMSW_DEC

    test();

    IF( st_ivas->hDecoderConfig->Opt_LsCustom && st_ivas->hLsSetupCustom == NULL )

#else

    IF( st_ivas->hDecoderConfig->Opt_LsCustom )

#endif

    {

        IF( EQ_32( ( error = ivas_ls_custom_open_fx( &( st_ivas->hLsSetupCustom ) ) ), IVAS_ERR_OK ) )

        {
@@ -1589,7 +1594,12 @@ ivas_error ivas_init_decoder_front( 
     * Allocate and initialize Head-Tracking handle

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



#ifdef FIX_FMSW_DEC

    test();

    IF( st_ivas->hDecoderConfig->Opt_Headrotation && st_ivas->hHeadTrackData == NULL )

#else

    IF( st_ivas->hDecoderConfig->Opt_Headrotation )

#endif

    {

        IF( NE_32( ( error = ivas_headTrack_open_fx( &( st_ivas->hHeadTrackData ) ) ), IVAS_ERR_OK ) )

        {
@@ -1606,7 +1616,12 @@ ivas_error ivas_init_decoder_front( 
     * Allocate and initialize external orientation handle

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



#ifdef FIX_FMSW_DEC

    test();

    IF( st_ivas->hDecoderConfig->Opt_ExternalOrientation && st_ivas->hExtOrientationData == NULL )

#else

    IF( st_ivas->hDecoderConfig->Opt_ExternalOrientation )

#endif

    {

        IF( NE_32( ( error = ivas_external_orientation_open_fx( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_num_subframes ) ), IVAS_ERR_OK ) )

        {
@@ -1619,7 +1634,12 @@ ivas_error ivas_init_decoder_front( 
     *--------------------------------------------------------------------*/



    test();

#ifdef FIX_FMSW_DEC

    test();

    IF( ( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation ) && st_ivas->hCombinedOrientationData == NULL )

#else

    IF( st_ivas->hDecoderConfig->Opt_Headrotation || st_ivas->hDecoderConfig->Opt_ExternalOrientation )

#endif

    {

        IF( NE_32( ( error = ivas_combined_orientation_open_fx( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_num_subframes ) ), IVAS_ERR_OK ) )

        {
@@ -1637,8 +1657,15 @@ ivas_error ivas_init_decoder_front( 
    test();

    test();

    test();

#ifdef FIX_FMSW_DEC

    test();

    IF( ( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ||

          ( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) ) &&

        st_ivas->hRenderConfig == NULL )

#else

    IF( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) || EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ||

        ( EQ_16( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_STEREO ) && st_ivas->hDecoderConfig->Opt_non_diegetic_pan ) )

#endif

    {

        IF( NE_32( ( error = ivas_render_config_open_fx( &( st_ivas->hRenderConfig ) ) ), IVAS_ERR_OK ) )

        {
@@ -3348,7 +3375,14 @@ void ivas_initialize_handles_dec( 
        st_ivas->hCPE[i] = NULL;

    }



#ifdef FIX_FMSW_DEC

    IF( !st_ivas->restartNeeded )

    {

#endif

        st_ivas->bit_stream = NULL;

#ifdef FIX_FMSW_DEC

    }

#endif

    st_ivas->mem_hp20_out_fx = NULL;

    st_ivas->hLimiter = NULL;
@@ -3393,6 +3427,10 @@ void ivas_initialize_handles_dec( 
    st_ivas->hMasaIsmData = NULL;

    st_ivas->hSbaIsmData = NULL;



#ifdef FIX_FMSW_DEC

    IF( !st_ivas->restartNeeded )

    {

#endif

        st_ivas->hHeadTrackData = NULL;

        st_ivas->hHrtfTD = NULL;

        st_ivas->hLsSetupCustom = NULL;
@@ -3402,6 +3440,9 @@ void ivas_initialize_handles_dec( 
        st_ivas->acousticEnvironmentsCount = 0;

        move16();

        st_ivas->pAcousticEnvironments = NULL;

#ifdef FIX_FMSW_DEC

    }

#endif



    st_ivas->hSplitBinRend = NULL;

    FOR( i = 0; i < MAX_HEAD_ROT_POSES - 1; ++i )
@@ -3429,10 +3470,17 @@ void ivas_initialize_handles_dec( 
 *-------------------------------------------------------------------------*/



void ivas_destroy_dec_fx(

#ifdef FIX_FMSW_DEC

    Decoder_Struct **st_ivas_out /* i/o: IVAS decoder handle      */

#else

    Decoder_Struct *st_ivas /* i/o: IVAS decoder handle      */

#endif

)

{

    Word16 i;

#ifdef FIX_FMSW_DEC

    Decoder_Struct *st_ivas = *st_ivas_out;

#endif



    /* CLDFB handles */

    FOR( i = 0; i < MAX_INTERN_CHANNELS; i++ )
@@ -3564,11 +3612,18 @@ void ivas_destroy_dec_fx( 
    ivas_ls_setup_conversion_close_fx( &st_ivas->hLsSetUpConversion );



    /* Custom LS configuration handle */

#ifdef FIX_FMSW_DEC

    IF( !st_ivas->restartNeeded )

    {

#endif

        IF( st_ivas->hLsSetupCustom != NULL )

        {

            free( st_ivas->hLsSetupCustom );

            st_ivas->hLsSetupCustom = NULL;

        }

#ifdef FIX_FMSW_DEC

    }

#endif



    /* Mono downmix structure */

    ivas_mono_dmx_renderer_close( &st_ivas->hMonoDmxRenderer );
@@ -3604,6 +3659,13 @@ void ivas_destroy_dec_fx( 
    /* HRTF statistics */

    ivas_HRTF_statistics_binary_close_fx( &st_ivas->hHrtfStatistics );



#ifdef FIX_FMSW_DEC

    /* Limiter struct */

    ivas_limiter_close_fx( &( st_ivas->hLimiter ) );



    IF( !st_ivas->restartNeeded )

    {

#endif

        /* Config. Renderer */

        ivas_render_config_close_fx( &( st_ivas->hRenderConfig ) );
@@ -3614,15 +3676,31 @@ void ivas_destroy_dec_fx( 
            st_ivas->pAcousticEnvironments = NULL;

        }



#ifndef FIX_FMSW_DEC

        /* Limiter struct */

        ivas_limiter_close_fx( &( st_ivas->hLimiter ) );



#endif

        /* Decoder configuration structure */

        IF( st_ivas->hDecoderConfig != NULL )

        {

            free( st_ivas->hDecoderConfig );

            st_ivas->hDecoderConfig = NULL;

        }

#ifdef FIX_FMSW_DEC

    }

    ELSE

    {

        /* resets in case of format switching */

        st_ivas->nchan_ism = 0;

        st_ivas->ism_mode = ISM_MODE_NONE;

        st_ivas->mc_mode = MC_MODE_NONE;

        st_ivas->sba_dirac_stereo_flag = 0;

        move16();

        move16();

        move16();

        move16();

    }

#endif



    /* TC buffer structure */

    ivas_dec_tc_buffer_close_fx( &st_ivas->hTcBuffer );
@@ -3640,7 +3718,15 @@ void ivas_destroy_dec_fx( 
    }



    /* main IVAS handle */

#ifdef FIX_FMSW_DEC

    if ( !st_ivas->restartNeeded )

    {

        free( *st_ivas_out );

        *st_ivas_out = NULL;

    }

#else

    free( st_ivas );

#endif



    return;

}