Commit b999fc6a authored by vaclav's avatar vaclav
Browse files

Merge branch '2054-basop-mr2140-from-float-keep-tsm-memory-in-jbm-bitrate-switching-2' into 'main' 

[non-BE] [allow-regression] Port MR2140 from float to BASOP - Keep TSM memory in JBM bitrate switching 2

Closes #2054

See merge request !2508
parents 22fa8965 b3f36442

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define JBM_MEMORY_OPT                                  /* VA: issue 916: optimization of RAM in the JBM decoder */

/*#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP*/           /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define NONBE_1324_TC_BUFFER_MEMOERY_KEEP               /* VA: issue 1324: do not reset TSM memory in JBM bitrate switching */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */

#define FIX_1413_IGF_INIT_PRINTOUT                      /* FhG: use correct variable for IGF initiliazation */

#define CODE_IMPROVEMENTS

lib_dec/ivas_jbm_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -804,6 +804,10 @@ ivas_error ivas_jbm_dec_tc_fx( 
            {

                Scale_sig32( p_output_fx[n], output_frame, sub( Q11, output_q ) ); // Q11

            }

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP

            st_ivas->hCPE[0]->q_output_mem_fx[0] = output_q;

            st_ivas->hCPE[0]->q_output_mem_fx[1] = output_q;

#endif

        }

    }

    ELSE IF( EQ_32( st_ivas->ivas_format, SBA_ISM_FORMAT ) )

lib_dec/ivas_omasa_dec_fx.c

+13 −0
Original line number Diff line number Diff line
@@ -757,6 +757,19 @@ ivas_error ivas_omasa_dec_config_fx( 
                /* ISM renderer handle + ISM data handle */

                ivas_omasa_separate_object_renderer_close( st_ivas );

            }

#ifdef NONBE_1324_TC_BUFFER_MEMOERY_KEEP



            IF( EQ_32( old_renderer_type, RENDERER_MONO_DOWNMIX ) )

            {

                DECODER_TC_BUFFER_HANDLE hTcBuffer = st_ivas->hTcBuffer;

                Word16 n_samples_still_available = sub( hTcBuffer->n_samples_buffered, hTcBuffer->n_samples_rendered );



                FOR( k = 0; k < hTcBuffer->nchan_transport_internal; k++ )

                {

                    Scale_sig32( hTcBuffer->tc_buffer_old_fx[k], n_samples_still_available, st_ivas->hCPE[0]->q_output_mem_fx[0] - Q11 );

                }

            }

#endif

        }



        IF( EQ_32( st_ivas->renderer_type, RENDERER_OMASA_MIX_EXT ) )