Commit 8d38ad7a authored by Jan Kiene's avatar Jan Kiene
Browse files

remove check for nullptr to have meaningful fails 

having the limiter handle allocated is simply necessary for those
operating points now, no hiding of errors
parent 365fea30

lib_enc/ivas_enc.c

+12 −27
Original line number Diff line number Diff line
@@ -195,6 +195,12 @@ ivas_error ivas_enc( 


        if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            int16_t num_dmx_channels;



            num_dmx_channels = 2;



#endif

            ivas_param_ism_enc( st_ivas, data_f, input_frame );



            /* Stereo DMX generation */
@@ -202,13 +208,7 @@ ivas_error ivas_enc( 
#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX



            /* Apply limiter on downmix */

            if ( st_ivas->hLimiter != NULL )

            {

                int16_t num_dmx_channels;



                num_dmx_channels = 2;

            ivas_limiter_apply( st_ivas->hLimiter, data_f, num_dmx_channels, input_frame, BER_detect_dummy );

            }

#endif



            /* Core coding of Stereo DMX */
@@ -266,10 +266,7 @@ ivas_error ivas_enc( 
#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX



            /* Apply limiter on transport channels */

            if ( st_ivas->hLimiter != NULL )

            {

            ivas_limiter_apply( st_ivas->hLimiter, data_f, st_ivas->nchan_transport, input_frame, BER_detect_dummy );

            }

#endif

        }
@@ -347,10 +344,7 @@ ivas_error ivas_enc( 


#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        /* Apply limiter on downmix */

        if ( st_ivas->hLimiter != NULL )

        {

        ivas_limiter_apply( st_ivas->hLimiter, data_f, num_channels, input_frame, BER_detect_dummy );

        }

#endif



        /* Encode ISMs transport channels */
@@ -461,10 +455,7 @@ ivas_error ivas_enc( 


#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

        /* Apply limiter on downmix */

        if ( st_ivas->hLimiter != NULL )

        {

        ivas_limiter_apply( st_ivas->hLimiter, data_f, st_ivas->nchan_transport, input_frame, BER_detect_dummy );

        }

#endif



        /* core-coding of transport channels */
@@ -538,10 +529,7 @@ ivas_error ivas_enc( 


#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            /* Apply limiter on downmix */

            if ( st_ivas->hLimiter != NULL )

            {

            ivas_limiter_apply( st_ivas->hLimiter, data_f, st_ivas->nchan_transport, input_frame, BER_detect_dummy );

            }

#endif



            if ( st_ivas->nCPE == 1 ) /* Stereo DMX */
@@ -576,10 +564,7 @@ ivas_error ivas_enc( 


#ifdef NONBE_FIX_1165_APPLY_LIMITER_ON_ENCODER_DMX

            /* Apply limiter on downmix */

            if ( st_ivas->hLimiter != NULL )

            {

            ivas_limiter_apply( st_ivas->hLimiter, data_f, st_ivas->nchan_transport, input_frame, BER_detect_dummy );

            }

#endif



            if ( st_ivas->hMcMasa->separateChannelEnabled )