Commit edb66e10 authored by vaclav's avatar vaclav
Browse files

issue 1052: Correctly exit the decoder when EXT is used in SBA format; under... 

issue 1052: Correctly exit the decoder when EXT is used in SBA format; under FIX_1052_SBA_EXT_OUTPUT
parent e5b2dd99

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_1033_MEMORY_LEAK_OMASA                      /* Nokia / Orange: issue #1033: Memory leak in OMASA to BINAURAL with HRTF with bitrate switching */

#define FIX_1052_SBA_EXT_OUTPUT                         /* VA: issue 1052: Correctly exit the decoder when EXT is used in SBA format */ 



/* #################### End BE switches ################################## */

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -3072,7 +3072,11 @@ static ivas_error doSanityChecks_IVAS( 
    else if ( st_ivas->ivas_format == SBA_FORMAT )

    {

        /* Verify SBA output coniguration */

#ifdef FIX_1052_SBA_EXT_OUTPUT

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID || output_config == IVAS_AUDIO_CONFIG_EXTERNAL )

#else

        if ( output_config == IVAS_AUDIO_CONFIG_INVALID )

#endif

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for SBA" );

        }