Commit e7b1014f authored by vaclav's avatar vaclav
Browse files

fix OSBA HR to stereo decoding; under NONBE_UNIFIED_DECODING_PATHS_FIX

parent 458235ea

lib_dec/ivas_jbm_dec.c

+14 −0
Original line number Diff line number Diff line
@@ -1230,13 +1230,27 @@ ivas_error ivas_jbm_dec_render( 
            {

                *nSamplesRendered = min( st_ivas->hTcBuffer->n_samples_available, nSamplesAskedLocal );



#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

                /* shift SBA channels to avoid overwrite by ISM upmix in 1 object case */

                if ( st_ivas->nchan_ism == 1 )

                {

                    mvr2r( p_output[2], p_output[3], *nSamplesRendered );

                    mvr2r( p_output[1], p_output[2], *nSamplesRendered );

                    p_tc[3] = p_output[3];

                }

#endif



                /* render objects */

                ivas_ism_render_sf( st_ivas, p_output, *nSamplesRendered );



                /* add already rendererd SBA part */

                for ( n = 0; n < nchan_out; n++ )

                {

#ifdef NONBE_UNIFIED_DECODING_PATHS_FIX

                    v_add( p_output[n], p_tc[n + max( nchan_out, st_ivas->nchan_ism )], p_output[n], *nSamplesRendered );

#else

                    v_add( p_output[n], p_tc[n + st_ivas->nchan_ism], p_output[n], *nSamplesRendered );

#endif

                }

            }

            else if ( st_ivas->renderer_type == RENDERER_OSBA_AMBI || st_ivas->renderer_type == RENDERER_OSBA_LS || st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM )