Commit 495785ec authored by fotopoulou's avatar fotopoulou
Browse files

fix remapping of SBA channels at decoder side

parent 591ca6ed

lib_dec/ivas_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ ivas_error ivas_dec( 
            hp20( output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }



        nchan_remapped = ivas_sba_remapTCs( output, st_ivas, output_frame );

        nchan_remapped = ivas_sba_remapTCs( &output[st_ivas->nchan_ism], st_ivas, output_frame );



#ifdef DEBUG_OSBA

        {

lib_enc/ivas_ism_metadata_enc.c

+22 −1
Original line number Diff line number Diff line
@@ -564,6 +564,27 @@ ivas_error ivas_ism_metadata_enc( 
#ifdef OSBA_DISC_OBJ_MCT

        if ( ism_mode == ISM_SBA_MODE_DISC )

        {

            int16_t md_diff_flag[MAX_NUM_OBJECTS];



            set_s( md_diff_flag, 1, nchan_ism );

            for ( ch = 0; ch < nchan_ism; ch++ )

            {

                hIsmMeta[ch]->last_ism_metadata_flag = hIsmMeta[ch]->ism_metadata_flag;



                if ( hIsmMeta[ch]->ism_metadata_flag == 0 )

                {

                    hIsmMeta[ch]->ism_md_fec_cnt_enc++;

                }

                else

                {

                    hIsmMeta[ch]->ism_md_fec_cnt_enc = 0;

                }

                hIsmMeta[ch]->ism_md_inc_diff_cnt++;

                hIsmMeta[ch]->ism_md_inc_diff_cnt = min( hIsmMeta[ch]->ism_md_inc_diff_cnt, ISM_MD_INC_DIFF_CNT_MAX );

            }



            update_last_metadata( nchan_ism, hIsmMeta, md_diff_flag );



            return error;

        }

#endif