Commit 0d5519ed authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

Merge remote-tracking branch 'origin/main' into 1680_basop_port_object_editing_implementation

parents 00520b58 36f0a8dc

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -155,9 +155,11 @@ 
#define FIX_1349_TNS_CRASH                              /* FhG: Fix crash in TNS entropy coding, in case order of joint TNS coding is reduced to 0 */

#define NONBE_FIX_1180_HQMDCT_PHECU_LT_MUTING           /* Ericsson: issue 1180, corrected long term mute loop attnuation after 200ms  in PhECU-PLC  */

#define FIX_1179_USAN_PHASEECU                          /* Eri: issue 1179:  better handling of 16 bit wrap around for very long(>200ms) FER-bursts   */

#define NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH             /* VA: issue 1199: fix bug in renderer flush in OMASA JBM bitrate switching */

#define NONBE_1200_ISM_JBM_BRATE_SW_FLUSH               /* VA: issue 1200: fix bug in renderer flush in ISM JBM bitrate switching */

#define NONBE_1293_CRASH_FIRST_FRAME_LOST               /* VA: issue 1293: fix G.192 decoder crash when first frame is lost */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

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



// object-editing feature porting

#define OBJ_EDITING_API                                 /* object editing changes related to the API */

lib_dec/ivas_init_dec_fx.c

+16 −0
Original line number Diff line number Diff line
@@ -690,7 +690,12 @@ ivas_error ivas_dec_setup( 
                st_ivas->nchan_transport = 1;

                move16();

            }



            /* this should be non-zero if original input format was MASA_ISM_FORMAT */

#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            st_ivas->ism_mode = ISM_MODE_NONE;

            move16();

#endif

            st_ivas->nchan_ism = add( st_ivas->bit_stream[sub( k, 3 )], shl( st_ivas->bit_stream[sub( k, 2 )], 1 ) );



            IF( GT_16( st_ivas->nchan_ism, 0 ) )
@@ -1008,6 +1013,17 @@ ivas_error ivas_dec_setup( 
            }

        }



#ifdef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

        test();

        IF( GT_16( st_ivas->ini_frame, 0 ) && EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

        {

            st_ivas->nchan_ism = 0;

            move16();

            st_ivas->ism_mode = ISM_MODE_NONE;

            move16();

        }



#endif

        IF( EQ_32( st_ivas->ivas_format, ISM_FORMAT ) )

        {

            ISM_MODE last_ism_mode = st_ivas->ism_mode;

lib_dec/ivas_jbm_dec_fx.c

+99 −72
Original line number Diff line number Diff line
@@ -2979,14 +2979,29 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
#endif

            }

        }

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

        {

        ELSE IF( EQ_16( st_ivas->ivas_format, SBA_ISM_FORMAT ) ){

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

            IF( EQ_32( ism_mode_old, ISM_SBA_MODE_DISC ) ){

#endif

                Word32 * tc_local_fx[MAX_TRANSPORT_CHANNELS];

        Word16 last_spar_md_idx;

        Word16 last_dirac_md_idx;

        UWord16 nSamplesAvailableNext;

#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

        ISM_MODE ism_mode_orig;

        RENDERER_TYPE renderer_type_orig;

        Word32 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;



        /* to render flushed samples, use configuration from the last received frame */

        move32();

        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];
@@ -2996,7 +3011,11 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
        /* 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_fx[ch_idx] = &st_ivas->hTcBuffer->tc_fx[ch_idx][hTcBuffer->n_samples_rendered];

#else

            tc_local_fx[ch_idx] = &st_ivas->hTcBuffer->tc_fx[ch_idx + 2][hTcBuffer->n_samples_rendered];

#endif

            Copy32( st_ivas->hSbaIsmData->delayBuffer_fx[ch_idx], tc_local_fx[ch_idx], st_ivas->hSbaIsmData->delayBuffer_size );

        }
@@ -3032,12 +3051,19 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
            return error;

        }



#ifdef NONBE_FIX_1297_SPAR_JBM_MEM_SAN

        /* restore original configuration */

        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

{

    return IVAS_ERROR( IVAS_ERR_WRONG_MODE, "Wrong IVAS format in VoIP renderer flushing!" );

}



hTcBuffer->n_samples_rendered = hTcBuffer->n_samples_granularity;

}
@@ -3065,6 +3091,7 @@ ivas_error ivas_jbm_dec_flush_renderer_fx( 
}



ivas_syn_output_fx( p_output_fx, Q11, *nSamplesRendered, st_ivas->hDecoderConfig->nchan_out, data );



return IVAS_ERR_OK;

}

lib_dec/ivas_masa_dec_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -1972,6 +1972,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 


    ivas_masa_set_elements_fx( ivas_total_brate, st_ivas->mc_mode, st_ivas->nchan_transport, st_ivas->hQMetaData, &tmp, &tmp, &tmp, st_ivas->ivas_format, st_ivas->ism_mode, ism_total_brate );



#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

    IF( EQ_32( st_ivas->ivas_format, MASA_FORMAT ) )

    {

        IF( NE_32( st_ivas->hDecoderConfig->output_config, IVAS_AUDIO_CONFIG_EXTERNAL ) )
@@ -1984,7 +1985,7 @@ ivas_error ivas_masa_dec_reconfigure_fx( 
        st_ivas->ism_mode = ISM_MODE_NONE;

        move16();

    }



#endif

    {

        Word16 tc_nchan_to_allocate;

        Word16 tc_nchan_transport;

lib_dec/lib_dec_fx.c

+5 −3
Original line number Diff line number Diff line
@@ -3647,7 +3647,6 @@ ivas_error IVAS_DEC_ReadFormat( 
    move32();

    move32();

    move32();

    move32();

    move16();

    move32();

    move32();
@@ -3763,12 +3762,14 @@ ivas_error IVAS_DEC_ReadFormat( 
#else

// 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

#endif



#ifndef NONBE_1199_OMASA_JBM_BRATE_SW_FLUSH

            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( tc_granularity_new < st_ivas->hTcBuffer->n_samples_granularity )

#endif

            IF( LT_16( tc_granularity_new, st_ivas->hTcBuffer->n_samples_granularity ) )

            {

                IF( ( error = ivas_jbm_dec_flush_renderer_fx( st_ivas, tc_granularity_new, renderer_type_old, intern_config_old, &st_ivas->hIntSetup, mc_mode_old, ism_mode_old, &hIvasDec->nSamplesFlushed, hIvasDec->flushbuffer ) ) != IVAS_ERR_OK )

                {
@@ -3790,6 +3791,7 @@ ivas_error IVAS_DEC_ReadFormat( 
    move16();

    move32();

    move32();

    move32();



    return IVAS_ERR_OK;

}