Commit 981a3429 authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_904_JBM_SBA_RS_FOA

parent cdd11cde

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_856_TCX_LTP_SYNTH_FILTER                    /* FhG: issue 856: correct filtering length for tcx-ltp synth filtering*/

#define NONBE_FIX_904_JBM_SBA_RS_FOA                          /* FhG: issue #904: fix JBM SBA RS to FOA decoding */

#define NONBE_FIX_898_ISM_BRATE_CRASH                         /* VA: issue 898: fix decoder crash in ISM bitrate switching with DTX and binaural output */

#define NONBE_FIX_862_UBSAN_SPAR_DEC_BR_SW_PLC                /* DLB: issue 862 : UBSAN: out-of-bound error in SPAR for OSBA bitrate switching with PLC*/

#define NONBE_FIX_DISCRETE_ISM_NOISE_SEED_HANDLING            /* FhG: fix handling of common and differing noise seeds in SCEs for ISM DTX */

lib_dec/ivas_jbm_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -881,10 +881,8 @@ void ivas_jbm_dec_feed_tc_to_renderer( 
        }

        else

        {

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA

            ivas_jbm_dec_td_renderers_adapt_subframes( st_ivas );



#endif

            ivas_sba_dec_digest_tc( st_ivas, n_render_timeslots, st_ivas->hTcBuffer->n_samples_available );

        }

    }

lib_dec/ivas_sba_dec.c

+0 −20
Original line number Diff line number Diff line
@@ -243,7 +243,6 @@ ivas_error ivas_sba_dec_reconfigure( 
            {

                return error;

            }

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA



            /* make sure the changed number of slots in the last subframe is not lost in the following steps */

            if ( st_ivas->hSpatParamRendCom != NULL )
@@ -251,7 +250,6 @@ ivas_error ivas_sba_dec_reconfigure( 
                st_ivas->hSpatParamRendCom->subframe_nbslots[st_ivas->hSpatParamRendCom->nb_subframes - 1] = st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1];

            }

            st_ivas->hSpar->subframe_nbslots[st_ivas->hSpar->nb_subframes - 1] = st_ivas->hTcBuffer->subframe_nbslots[st_ivas->hTcBuffer->nb_subframes - 1];

#endif

        }

    }
@@ -649,7 +647,6 @@ ivas_error ivas_sba_dec_reconfigure( 
    }



    /* resync SPAR and DirAC JBM info from TC Buffer */

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA

    if ( st_ivas->hSpatParamRendCom != NULL && st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity )

    {

        mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );
@@ -659,21 +656,6 @@ ivas_error ivas_sba_dec_reconfigure( 
    mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpar->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

    st_ivas->hSpar->nb_subframes = st_ivas->hTcBuffer->nb_subframes;

    st_ivas->hSpar->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

#else

    if ( st_ivas->hSpatParamRendCom != NULL )

    {

        if ( st_ivas->hSpatParamRendCom->slot_size == st_ivas->hTcBuffer->n_samples_granularity )

        {

            mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpatParamRendCom->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

            st_ivas->hSpatParamRendCom->nb_subframes = st_ivas->hTcBuffer->nb_subframes;

            st_ivas->hSpatParamRendCom->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;



            mvs2s( st_ivas->hTcBuffer->subframe_nbslots, st_ivas->hSpar->subframe_nbslots, MAX_JBM_SUBFRAMES_5MS );

            st_ivas->hSpar->nb_subframes = st_ivas->hTcBuffer->nb_subframes;

            st_ivas->hSpar->subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

        }

    }

#endif



    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV && st_ivas->ism_mode == ISM_SBA_MODE_DISC )

    {
@@ -682,9 +664,7 @@ ivas_error ivas_sba_dec_reconfigure( 
        for ( n = 0; n < MAX_JBM_SUBFRAMES_5MS; n++ )

        {

            st_ivas->hSpatParamRendCom->subframe_nbslots[n] = st_ivas->hTcBuffer->subframe_nbslots[n] * granularityMultiplier;

#ifdef NONBE_FIX_904_JBM_SBA_RS_FOA

            st_ivas->hSpar->subframe_nbslots[n] = st_ivas->hSpatParamRendCom->subframe_nbslots[n];

#endif

        }

    }