Commit bc7fc194 authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'main' into fix-mdct-stereo-noise-est-scaling

parents 6515d513 0936cb42

lib_com/bitstream.c

+4 −0
Original line number Diff line number Diff line
@@ -2624,9 +2624,11 @@ ivas_error preview_indices( 
            case SID_ISM:

                st_ivas->ivas_format = ISM_FORMAT;

                break;

#ifndef FIX_1209_SID_SIGNALING

            case SID_MULTICHANNEL:

                st_ivas->ivas_format = MC_FORMAT;

                break;

#endif

            case SID_SBA_1TC:

                st_ivas->ivas_format = SBA_FORMAT;

                st_ivas->element_mode_init = IVAS_SCE;
@@ -2651,7 +2653,9 @@ ivas_error preview_indices( 
                }

                break;

            default:

#ifndef FIX_1209_SID_SIGNALING

                /* This should actually be impossible, since only 3 bits are read, so if this happens something is broken */

#endif

                return IVAS_ERROR( IVAS_ERR_INTERNAL_FATAL, "Invalid value %c found in SID format field.", st_ivas->sid_format );

        }

    }

lib_enc/ivas_decision_matrix_enc.c

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ void ivas_decision_matrix_enc( 
#ifdef NONBE_FIX_1205_TD_STEREO_MOD_CT

        /* In TD stereo below 24.4 kbps we cannot overwrite the `coder_type` when it is set to TRANSITION, */

        /* as it is used for TD stereo bit allocation. To ensure consistent bit allocation, it must remain unchanged on the decoder side. */

        if ( st->idchan == 0 && !( element_brate <= IVAS_16k4 && st->coder_type == TRANSITION && st->element_mode == IVAS_CPE_TD ) )

        if ( st->idchan == 0 && !( element_brate < IVAS_24k4 && st->coder_type == TRANSITION && st->element_mode == IVAS_CPE_TD ) )

        {

            st->coder_type = AUDIO;

        }