Commit fa03bf22 authored by vaclav's avatar vaclav
Browse files

Merge branch '881-lfe-addition-in-ism-format' into 'main' 

Resolve "LFE addition in ISM format"

See merge request !1213
parents bb499937 e9a19f02

lib_com/options.h

100755 → 100644
+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ 


#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_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 )

lib_dec/ivas_jbm_dec.c

+4 −2
Original line number Diff line number Diff line
@@ -1097,8 +1097,9 @@ ivas_error ivas_jbm_dec_render( 
                {

                    return error;

                }



#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                ivas_binaural_add_LFE( st_ivas, *nSamplesRendered, p_output, p_output );

#endif

            }

#ifdef DEBUGGING

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )
@@ -1654,8 +1655,9 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                    {

                        return error;

                    }



#ifndef FIX_881_REMOVE_LFE_ADDITION_IN_ISM

                    ivas_binaural_add_LFE( st_ivas, hTcBuffer->n_samples_granularity, p_output, p_output );

#endif

                }

            }

            else