Commit bc6bb96d authored by multrus's avatar multrus
Browse files

Merge branch '1886_ref_tcxCrash' into 'ivas-float-update' 

Port MR2164 from float to ivas-float-update

See merge request !2025
parents b165ae4d 38296f77

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 


#ifdef DEBUG_MODE_MDCT

#define DEBUG_PLOT_BITS

#define DEBUG_OSBA_MD_BITS

#endif



#define ENABLE_BITRATE_VERIFICATION             /* Enable bitrate verification - use when playing with bit budget */
@@ -198,6 +199,7 @@ 
#define FIX_1111_TDM_LSP_BUFFER                         /* VA: issue 1111: remove unused buffer `tdm_lspQ_PCh[]' */

#define NONBE_1325_TD_STEREO_QUANT_LSF_SEC              /* Nokia: issue 1325: fix for usage of active_cnt variable in TD stereo LSFQ */

#define NONBE_FIX_1130_DIV_ZERO_LEV_DUR                 /* VA: issue 1130: avoid div by zero in L-D by thresholding R[0] to a min value of 100.0 */

#define NONBE_1329_FIX_OSBA_CRASH                       /* FhG: issue 1329: prevent assert when bit budget is low*/





/* #################### End BASOP porting switches ############################ */

lib_enc/enc_prm.c

+15 −0
Original line number Diff line number Diff line
@@ -565,6 +565,12 @@ void writeTCXparam( 
                                                            nbits_tcx, NPRM_RESQ * st->hTcxCfg->resq, flag_ctx_hm ? &hm_cfg[k] : NULL );

                }

            }

#ifdef DEBUG_PLOT_BITS

            if ( core == TCX_10_CORE )

            {

                dbgwrite( &nbits_tcx, sizeof( int16_t ), 1, 1, "./res/bits_RC" );

            }

#endif

        }

    }

#ifdef DEBUG_PLOT_BITS
@@ -576,6 +582,15 @@ void writeTCXparam( 
            dbgwrite( &tmp, sizeof( int16_t ), 1, 1, "./res/bits_TNS" );

        }

    }

    else

    {

        if ( nSubframes == 1 )

        {

            tmp = 0;

            dbgwrite( &nbits_tcx, sizeof( int16_t ), 1, 1, "./res/bits_RC" );

            dbgwrite( &tmp, sizeof( int16_t ), 1, 1, "./res/bits_RC" );

        }

    }

#endif



    return;

lib_enc/ivas_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -412,6 +412,11 @@ ivas_error ivas_enc( 
            /* get SBA TCs */

            ivas_sba_getTCs( &data_f[n], st_ivas, input_frame );

        }

#ifdef DEBUG_OSBA_MD_BITS

        {

            dbgwrite( &nb_bits_metadata[0], sizeof( int16_t ), hEncoderConfig->nchan_ism + 1, 1, "./res/osba_md_bits" );

        }

#endif



        /* core-coding of transport channels */

        if ( st_ivas->nSCE == 1 )

lib_enc/ivas_mct_core_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -452,6 +452,10 @@ void ivas_mct_core_enc( 
        /*write IGF data to bitstream*/

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

        {

#ifdef DEBUG_PLOT_BITS

            int16_t tmp = hBstr->nb_bits_tot;

#endif



            st = sts[ch];

            if (

                sts[ch]->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
@@ -459,6 +463,10 @@ void ivas_mct_core_enc( 
                continue;

            }

            enc_prm_igf_mdct( st, hBstr );

#ifdef DEBUG_PLOT_BITS

            tmp = hBstr->nb_bits_tot - tmp;

            dbgwrite( &tmp, sizeof( int16_t ), 1, 1, "./res/bits_IGF" );

#endif

        }

    }

lib_enc/ivas_mdct_core_enc.c

+8 −0
Original line number Diff line number Diff line
@@ -1146,6 +1146,9 @@ void ivas_mdct_core_whitening_enc( 
        skipped_first_channel = 0;

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

        {

#ifdef DEBUG_PLOT_BITS

            int16_t tmp = hBstr->nb_bits_tot;

#endif

            st = sts[ch];



            if ( st->mct_chan_mode == MCT_CHAN_MODE_IGNORE )
@@ -1170,6 +1173,11 @@ void ivas_mdct_core_whitening_enc( 
            }

            encode_lpc_avq( hBstr, num_sns, param_lpc[ch], st->core, st->element_mode );



#ifdef DEBUG_PLOT_BITS

            tmp = hBstr->nb_bits_tot - tmp;

            dbgwrite( &tmp, sizeof( int16_t ), 1, 1, "./res/bits_SNS" );

#endif



            st->side_bits_frame_channel += hBstr->nb_bits_tot - nbits_start_sns;

        }

    }