Commit fd62e881 authored by vaclav's avatar vaclav
Browse files

fix decoder BR switching

parent 60715ab5

lib_dec/ivas_cpe_dec.c

+4 −5
Original line number Diff line number Diff line
@@ -249,11 +249,9 @@ ivas_error ivas_cpe_dec( 
                nb_bits -= SID_FORMAT_NBITS;

                sts[1]->bit_stream -= SID_FORMAT_NBITS;

            }

#ifdef MASA_AND_OBJECTS



            if ( ( ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) ||

                   ( st_ivas->ivas_format == MASA_ISM_FORMAT && ( cpe_brate < MASA_STEREO_MIN_BITRATE ) ) ) &&

                 ivas_total_brate > IVAS_SID_5k2 )

#ifdef MASA_AND_OBJECTS

            if ( ( ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE ) || ( st_ivas->ivas_format == MASA_ISM_FORMAT && cpe_brate < MASA_STEREO_MIN_BITRATE ) ) && ivas_total_brate > IVAS_SID_5k2 )

#else

            if ( st_ivas->ivas_format == MASA_FORMAT && ivas_total_brate < MASA_STEREO_MIN_BITRATE && ivas_total_brate > IVAS_SID_5k2 )

#endif
@@ -373,6 +371,7 @@ ivas_error ivas_cpe_dec( 
    /*----------------------------------------------------------------*

     * Core codec configuration

     *----------------------------------------------------------------*/



    for ( n = 0; n < n_channels; n++ )

    {

        /* set ACELP12k8 / ACELP16k flag for flexible ACELP core */

lib_dec/ivas_omasa_dec.c

+10 −0
Original line number Diff line number Diff line
@@ -187,6 +187,16 @@ ivas_error ivas_omasa_dec_config( 
        return error;

    }



    // VE!!!!!: verification needed, see comment "/* Todo: Nokia make for MASA_ISM*/" in ivas_masa_dec_reconfigure()

    if ( cpe_brate < MASA_STEREO_MIN_BITRATE )

    {

        st_ivas->hCPE[0]->nchan_out = 1;

    }

    else

    {

        st_ivas->hCPE[0]->nchan_out = 2;

    }



    /* OMASA reconfig. */

    if ( st_ivas->hMasaIsmData == NULL && st_ivas->ivas_format == MASA_ISM_FORMAT )

    {