Commit e50511f9 authored by vaclav's avatar vaclav
Browse files

Merge branch '556-bandwidth-in-1ism-at-24-4-kbps' into 'main' 

[non-BE] Resolve "Bandwidth in 1ISM at 24.4 kbps"

See merge request !753
parents 9320f23e 3bf665b5

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -313,6 +313,9 @@ typedef enum 
#define MIN_BRATE_SWB_SCE                       ACELP_9k60                  /* min. SCE bitrate where SWB is supported */

#define MIN_BRATE_SWB_STEREO                    IVAS_13k2                   /* min. stereo bitrate where SWB is supported */

#define MIN_BRATE_FB_STEREO                     IVAS_32k                    /* min. SCE and stereo bitrate where FB is supported */

#ifdef ISM_FB

#define MIN_BRATE_FB_ISM                        24000                       /* min. SCE bitrate where FB is supported in ISM format */

#endif



#define MIN_TDM_BRATE_WB_TBE_1k05               12000                       /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

#define MIN_BRATE_WB_TBE_1k05                   9650                        /* min. per channel bitrate where WB TBE @1.05 kbps is supported (0.35kbs at lower bitrates) */

lib_com/options.h

+2 −2
Original line number Diff line number Diff line
@@ -159,10 +159,10 @@ 


#define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */



#define FIX_522_ISM_FIRST_SID                           /* VA: fix ISM decoder crash if first received frame is an SID */



#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */





/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_sce_dec.c

+5 −0
Original line number Diff line number Diff line
@@ -123,7 +123,12 @@ ivas_error ivas_sce_dec( 
            /* only WB is supported */

            st->bwidth = WB;

        }

#ifdef ISM_FB

        else if ( ( hSCE->element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) ||

                  ( hSCE->element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) )

#else

        else if ( hSCE->element_brate < MIN_BRATE_FB_STEREO )

#endif

        {

            /* WB and SWB are supported */

            st->bwidth = get_next_indice( st, 1 ) + WB;

lib_enc/bw_detect.c

+5 −0
Original line number Diff line number Diff line
@@ -587,7 +587,12 @@ void set_bw( 
            {

                st->bwidth = WB;

            }

#ifdef ISM_FB

            else if ( st->bwidth > SWB && ( ( element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) ||

                                            ( element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) ) )

#else

            else if ( element_brate < MIN_BRATE_FB_STEREO && st->bwidth > SWB )

#endif

            {

                st->bwidth = SWB;

            }

lib_enc/ivas_decision_matrix_enc.c

+5 −0
Original line number Diff line number Diff line
@@ -434,7 +434,12 @@ void ivas_signaling_enc( 
            {

                /* only WB is supported */

            }

#ifdef ISM_FB

            else if ( ( element_brate < MIN_BRATE_FB_STEREO && !st->is_ism_format ) ||

                      ( element_brate < MIN_BRATE_FB_ISM && st->is_ism_format ) )

#else

            else if ( element_brate < MIN_BRATE_FB_STEREO )

#endif

            {

                /* WB and SWB are supported */

                ind = st->bwidth - WB;