Commit c8247855 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

partial porting of MR 2052

parent a5408903

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/

#define NONBE_FIX_1128_OSBA_EXT_OUTPUT_ORDER            /* FhG: issue 1128: set output ambisonics order to input order for EXT output  */



#define NONBE_FIX_1297_SPAR_JBM_MEM_SAN                 /*Dolby: issue 1297, SPAR + JBM + BR switch memory sanitizer*/  



/* #################### End BASOP porting switches ############################ */

lib_dec/ivas_jbm_dec.c

+62 −31
Original line number Diff line number Diff line
@@ -1700,20 +1700,45 @@ ivas_error ivas_jbm_dec_flush_renderer( 
        }

        else if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

            if ( ism_mode_old == ISM_SBA_MODE_DISC )

            {

#endif

                float *tc_local[MAX_TRANSPORT_CHANNELS];

                int16_t last_spar_md_idx;

                int16_t last_dirac_md_idx;

                uint16_t nSamplesAvailableNext;

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

                ISM_MODE ism_mode_orig;

                RENDERER_TYPE renderer_type_orig;

                int32_t ivas_total_brate;

                ivas_total_brate = st_ivas->hDecoderConfig->ivas_total_brate;

                renderer_type_orig = st_ivas->renderer_type;

                ism_mode_orig = st_ivas->ism_mode;

                st_ivas->ism_mode = ism_mode_old;

                st_ivas->renderer_type = renderer_type_old;

                st_ivas->hDecoderConfig->ivas_total_brate = st_ivas->hDecoderConfig->last_ivas_total_brate;

#endif



                last_spar_md_idx = st_ivas->hSpar->render_to_md_map[st_ivas->hSpar->slots_rendered - 1];

                last_dirac_md_idx = st_ivas->hSpatParamRendCom->render_to_md_map[st_ivas->hSpatParamRendCom->slots_rendered - 1];

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

#ifdef DEBUGGING

                assert( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV );

#endif

#else

#ifdef DEBUGGING

            assert( ism_mode_old == ISM_SBA_MODE_DISC && st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV );

#endif

#endif

                /* copy from ISM delay buffer to the correct place in tcs */

                for ( ch_idx = 0; ch_idx < st_ivas->nchan_ism; ch_idx++ )

                {

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

                    tc_local[ch_idx] = &st_ivas->hTcBuffer->tc[ch_idx][hTcBuffer->n_samples_rendered];

#else

                tc_local[ch_idx] = &st_ivas->hTcBuffer->tc[ch_idx + 2][hTcBuffer->n_samples_rendered];

#endif

                    mvr2r( st_ivas->hSbaIsmData->delayBuffer[ch_idx], tc_local[ch_idx], st_ivas->hSbaIsmData->delayBuffer_size );

                }
@@ -1738,6 +1763,12 @@ ivas_error ivas_jbm_dec_flush_renderer( 
                {

                    return error;

                }

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

                st_ivas->ism_mode = ism_mode_orig;

                st_ivas->renderer_type = renderer_type_orig;

                st_ivas->hDecoderConfig->ivas_total_brate = ivas_total_brate;

            }

#endif

        }

        else

        {