Commit 6a3bdd9b authored by vaclav's avatar vaclav
Browse files

maintenance: formatting, returning errors

parent 42abcb73

apps/decoder.c

+13 −17
Original line number Diff line number Diff line
@@ -206,6 +206,10 @@ int main( 
#ifdef NONBE_UNIFIED_DECODING_PATHS

    IVAS_RENDER_FRAMESIZE asked_frame_size;

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#endif

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t cnt_frames_limited;
@@ -746,9 +750,7 @@ int main( 


    if ( arg.hrtfReaderEnabled )

    {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#else

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif
@@ -801,7 +803,10 @@ int main( 
        }

#endif

#endif



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#endif

        if ( ( error = IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nIVAS_DEC_GetHrtfCRendHandle failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
@@ -972,31 +977,22 @@ cleanup: 
#endif

    if ( arg.hrtfReaderEnabled )

    {

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

#else

#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_HANDLE hHrtfTD = NULL;

#endif

        IVAS_DEC_GetHrtfHandle( hIvasDec, &hHrtfTD );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hHrtfTD != NULL )

        {

        destroy_td_hrtf( hHrtfTD );

        }

#else

        dealloc_HRTF_binary( *hHrtfTD );

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE *hSetOfHRTF = NULL;

#else



#ifndef NONBE_FIX_BINARY_BINAURAL_READING

        IVAS_DEC_HRTF_CREND_HANDLE hSetOfHRTF = NULL;

#endif

        IVAS_DEC_GetHrtfCRendHandle( hIvasDec, &hSetOfHRTF );

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        if ( hSetOfHRTF != NULL )

        {

        destroy_SetOfHRTF( hSetOfHRTF );

        }

#else

        destroy_SetOfHRTF( *hSetOfHRTF );

#endif

apps/renderer.c

+12 −14
Original line number Diff line number Diff line
@@ -900,8 +900,8 @@ int main( 
            exit( -1 );

        }

    }

#endif



#endif

    if ( !isEmptyString( args.renderConfigFilePath ) )

    {

        if ( RenderConfigReader_open( args.renderConfigFilePath, &renderConfigReader ) != IVAS_ERR_OK )
@@ -1031,15 +1031,19 @@ int main( 
#endif



#ifdef NONBE_UNIFIED_DECODING_PATHS

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,



#ifdef NONBE_FIX_BINARY_BINAURAL_READING

                                   !isEmptyString( args.customHrtfFilePath ),

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ),

#else

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,

#endif

                                   args.nonDiegeticPan, args.nonDiegeticPanGain, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

                                   !isEmptyString( args.customHrtfFilePath ),



    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig, !isEmptyString( args.customHrtfFilePath ),

#else

    if ( ( error = IVAS_REND_Open( &hIvasRend, args.sampleRate, args.outConfig.audioConfig,

#endif

                                   args.nonDiegeticPan, args.nonDiegeticPanGain, ( args.framing_5ms ) ? 1 : 4 ) ) != IVAS_ERR_OK )

#endif
@@ -1146,11 +1150,11 @@ int main( 
                }

            }

        }



        hrtfFileReader_close( &hrtfFileReader );

    }

#endif





    /* === Configure === */

    if ( ( error = IVAS_REND_InitConfig( hIvasRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

    {
@@ -2285,14 +2289,8 @@ cleanup: 
    hrtfFileReader_close( &hrtfFileReader );

#endif

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

    if ( hSetOfHRTF != NULL && *hSetOfHRTF != NULL )

    {

        destroy_SetOfHRTF( hSetOfHRTF );

    }

    if ( hHrtfTD != NULL && *hHrtfTD != NULL )

    {

    destroy_td_hrtf( hHrtfTD );

    }

    destroy_SetOfHRTF( hSetOfHRTF );

#endif

    IVAS_REND_Close( &hIvasRend );

    IsmPositionProvider_close( positionProvider );

lib_com/ivas_error.h

+4 −0
Original line number Diff line number Diff line
@@ -260,6 +260,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Acoustic environment not supported";

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

#ifdef NONBE_FIX_BINARY_BINAURAL_READING

        case IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA:

            return "Renderer data missing in HRTF binary file";

#endif

        case IVAS_ERR_INVALID_INPUT_FORMAT:

            return "Invalid input format";

        case IVAS_ERR_INVALID_INDEX:

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ 
/* only BE switches wrt selection floating point code */



/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */

/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#define SPLIT_REND_WITH_HEAD_ROT                    /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define FIX_638_ENERGIE_IAC_ROM_TABLES                  /* Orange : Missing left/right and coherence late reverb tables in binary format*/
@@ -167,7 +167,7 @@ 
#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */

#define NONBE_FIX_874_OMASA_BRSW_2TD                          /* Nokia: issue 874: Fixes the crashes with the long test vectors that prompted switching to TD*/

#define NONBE_FIX_BINARY_BINAURAL_READING                      /* Add support reading binaural binary file */

#define NONBE_FIX_BINARY_BINAURAL_READING                     /* Add support for reading binaural binary file */

#define NONBE_FIX_871_ACELP_CRASH_IN_OSBA                     /* FhG: isse 871: crash in ACELP core encoder with OSBA */

#define NONBE_FIX_225_MASA_EXT_REND                           /* Nokia: Resolve #225: Complete MASA external renderer implementation */

#define NONBE_FIX_897_USAN_WITH_MASA_RENDERING                /* Nokia: issue #897: USAN null pointer in MASA external renderer to Ambisonics */

lib_dec/ivas_init_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -2728,6 +2728,7 @@ void ivas_destroy_dec( 
        ivas_td_binaural_close( &st_ivas->hBinRendererTd );

    }

#ifdef NONBE_FIX_BINARY_BINAURAL_READING



    if ( st_ivas->hHrtfTD != NULL )

#else

    else if ( st_ivas->hHrtfTD != NULL )