Commit 938b04ae authored by Jan Kiene's avatar Jan Kiene
Browse files

open limiter for max channels possible per operating point

parent eaecc7c2

lib_enc/ivas_init_enc.c

+6 −20
Original line number Diff line number Diff line
@@ -550,7 +550,7 @@ ivas_error ivas_init_encoder( 
            }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, MAX_NUM_OBJECTS, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -636,7 +636,7 @@ ivas_error ivas_init_encoder( 
#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        if ( ivas_format == SBA_FORMAT )

        {

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, MAX_INPUT_CHANNELS, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -645,25 +645,11 @@ ivas_error ivas_init_encoder( 
    }

    else if ( ivas_format == MASA_ISM_FORMAT )

    {

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        int16_t num_channels;

#endif

        int32_t ism_total_brate;

        int16_t k;



        st_ivas->ism_mode = ivas_omasa_ism_mode_select( ivas_total_brate, hEncoderConfig->nchan_ism );

        st_ivas->nchan_transport = 2;

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        num_channels = st_ivas->nchan_transport;

        if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            num_channels += hEncoderConfig->nchan_ism;

        }

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

        {

            num_channels += 1;

        }

#endif



        if ( ( error = ivas_ism_metadata_enc_create( st_ivas, hEncoderConfig->nchan_ism, element_brate_tmp ) ) != IVAS_ERR_OK )

        {
@@ -718,7 +704,7 @@ ivas_error ivas_init_encoder( 
        }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, num_channels, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, CPE_CHANNELS + MAX_NUM_OBJECTS, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -810,7 +796,7 @@ ivas_error ivas_init_encoder( 
        }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

        if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, MAX_INPUT_CHANNELS + MAX_NUM_OBJECTS, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

        {

            return error;

        }
@@ -903,7 +889,7 @@ ivas_error ivas_init_encoder( 
            }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, PARAM_MC_MAX_TRANSPORT_CHANS, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }
@@ -951,7 +937,7 @@ ivas_error ivas_init_encoder( 
            }



#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, st_ivas->nchan_transport, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            if ( ( error = ivas_limiter_open( &st_ivas->hLimiter, CPE_CHANNELS + 1, st_ivas->hEncoderConfig->input_Fs ) ) != IVAS_ERR_OK )

            {

                return error;

            }