Commit 222e5f5e authored by vaclav's avatar vaclav
Browse files

port missing parts of NONBE_1303_REND_GRANULARITY

parent 8be2af90

lib_dec/ivas_masa_dec.c

+2 −0
Original line number Diff line number Diff line
@@ -1556,7 +1556,9 @@ ivas_error ivas_masa_dec_reconfigure( 
            }

            if ( st_ivas->ivas_format == MASA_ISM_FORMAT && st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->ism_mode == ISM_MASA_MODE_DISC )

            {

#ifndef NONBE_1303_REND_GRANULARITY

                n_samples_granularity = NS2SA( st_ivas->hDecoderConfig->output_Fs, FRAME_SIZE_NS / MAX_PARAM_SPATIAL_SUBFRAMES ); /* Use the same granularity as tdrend */

#endif

                if ( n_samples_granularity > st_ivas->hTcBuffer->n_samples_granularity )

                {

                    if ( ( error = ivas_jbm_dec_set_discard_samples( st_ivas ) ) != IVAS_ERR_OK )

lib_dec/lib_dec.c

+6 −1
Original line number Diff line number Diff line
@@ -1058,7 +1058,12 @@ ivas_error IVAS_DEC_ReadFormat( 
        {

            int16_t tc_granularity_new = ivas_jbm_dec_get_render_granularity( st_ivas->renderer_type, renderer_type_sec_new, st_ivas->hDecoderConfig->output_Fs );



            st_ivas->nchan_transport = nchan_transport_old;

            // st_ivas->nchan_transport = nchan_transport_old; // ToDo: temporarily deactivated to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1200



            if ( st_ivas->ivas_format == MASA_FORMAT )

            {

                st_ivas->nchan_ism = 0; // ToDo: temporary hack to keep FIX_HRTF_LOAD bit-exact but this is likely a bug in the main -> see issue #1199

            }



            if ( st_ivas->hTcBuffer == NULL )

            {