Commit 80295cbb authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into 903_revert_the_fix

parents 8deddd5f fa03bf22

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ if(UNIX) 
    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -m64")

  endif()

  # C compiler flags

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -ffp-contract=off")  # disable floating point operation contraction

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes")

  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror-implicit-function-declaration -Wno-unused-parameter")

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ endif 
CFLAGS   += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror-implicit-function-declaration \

            -Wno-implicit-fallthrough

            -Wno-implicit-fallthrough -ffp-contract=off



# libs to link

LDLIBS   += -lm

lib_com/options.h

100755 → 100644
+2 −0
Original line number Diff line number Diff line
@@ -151,6 +151,8 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_643_PCA_OPTION                              /* VA: issue 643: rename PCA bypass command-line option */

#define FIX_902_HACK_IN_CORECODER                       /* VA: issue 902: remove a hack in ivas_core_dec() */

#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */



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

#define FIX_899_VARIABLE_SPEED_DECODING                       /* FhG: Fix variable speed decoding                                    */

lib_dec/ivas_core_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -112,7 +112,11 @@ ivas_error ivas_core_dec( 
        sts = hSCE->hCoreCoder;

        hStereoICBWE = NULL;

        element_brate = hSCE->element_brate;

#ifdef FIX_902_HACK_IN_CORECODER

        last_element_brate = hSCE->last_element_brate; /* note: this parameter is unused */

#else

        last_element_brate = hSCE->element_brate; /*  hack - the past parameter is not really needed */

#endif

        last_element_mode = IVAS_SCE;

        hStereoTD = NULL;

        p_output_mem = NULL;

lib_dec/ivas_dec.c

+2 −1
Original line number Diff line number Diff line
@@ -304,8 +304,9 @@ ivas_error ivas_dec( 
                {

                    return error;

                }



#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                ivas_binaural_add_LFE( st_ivas, output_frame, p_output, p_output );

#endif

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )