Commit 22b140ae authored by reutelhuber's avatar reutelhuber
Browse files

some cleanup of unused code

parent 852e8967

lib_dec/ivas_init_dec.c

+0 −36
Original line number Diff line number Diff line
@@ -1361,42 +1361,7 @@ ivas_error ivas_init_decoder( 
        int32_t temp_brate[MAX_SCE];

        st_ivas->ism_extmeta_active = -1;

        st_ivas->ism_extmeta_cnt = 0;

#if 0

        if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        /* this is resetting the nSCE to 1 */

        if ( ( error = ivas_spar_dec_open( st_ivas, 0 ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        /* Todo Nokia: Renderer should be selected in ivas_renderer_select(), but currently the number of transport channels is not available at that point.

         * Hence, a temporary fix was done here, which adjusts the renderer after the number of transports is known. Optimally, this should be fixed by

         * reading the number of transports before the renderer is selected. */

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC && st_ivas->nchan_transport >= 3 )

        {

            st_ivas->renderer_type = RENDERER_BINAURAL_FASTCONV;

            st_ivas->intern_config = AUDIO_CONFIG_HOA3;

            st_ivas->hIntSetup.output_config = AUDIO_CONFIG_HOA3; /* Todo: Check if this affects tdrend in some way. */

        }



        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, ivas_get_hodirac_flag( ivas_total_brate, st_ivas->sba_analysis_order ) ? IVAS_MAX_NUM_BANDS : ( IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        if ( ( error = ivas_dirac_dec_open( st_ivas ) ) != IVAS_ERR_OK )

        {

            return error;

        }



        st_ivas->hSpar->enc_param_start_band = st_ivas->hDirAC->hConfig->enc_param_start_band;



        st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );

#else

        if ( ( error = ivas_qmetadata_open( &( st_ivas->hQMetaData ) ) ) != IVAS_ERR_OK )

        {

            return error;
@@ -1446,7 +1411,6 @@ ivas_error ivas_init_decoder( 
                                     st_ivas->hSpar->dirac_to_spar_md_bands, st_ivas->hQMetaData->useLowerBandRes, st_ivas->hSpar->enc_param_start_band, 0 );

        }

        st_ivas->sba_dirac_stereo_flag = ivas_get_sba_dirac_stereo_flag( st_ivas );

#endif



        st_ivas->nCPE += ( st_ivas->nchan_ism + 1 ) >> 1;

lib_dec/ivas_osba_dec.c

+2 −26
Original line number Diff line number Diff line
@@ -150,33 +150,18 @@ ivas_error ivas_osba_dirac_td_binaural( 


    ivas_error error;

    float *p_sepobj[MAX_NUM_OBJECTS];

#ifdef SBA_AND_OBJECTS

    int16_t channel_offset;

#endif



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

    {

        p_sepobj[n] = &data_separated_objects[n][0];

    }

#ifdef SBA_AND_OBJECTS

#if 0

    channel_offset = st_ivas->nchan_transport;

    if ( st_ivas->ivas_format == SBA_ISM_FORMAT && st_ivas->nchan_transport == 3 ) /* channels are remapped in ivas_sba_remapTCs() */

    {

        channel_offset = 4;

    }

#endif



    channel_offset = st_ivas->nchan_ism;

#endif



    for ( n = 0; n < st_ivas->nchan_ism; n++ )

    {

#ifdef SBA_AND_OBJECTS

        mvr2r( output[n], data_separated_objects[n], output_frame );

#else

        mvr2r( output[2 + n], data_separated_objects[n], output_frame );

#endif

        // v_multc( data_separated_objects[n], gain, data_separated_objects[n], output_frame );

    }



    for ( n = 0; n < st_ivas->nchan_ism; n++ )
@@ -184,8 +169,6 @@ ivas_error ivas_osba_dirac_td_binaural( 
        delay_signal( data_separated_objects[n], output_frame, st_ivas->hMasaIsmData->delayBuffer[n], st_ivas->hMasaIsmData->delayBuffer_size );

    }





#ifdef SBA_AND_OBJECTS

    if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

    {

        ivas_sba_upmixer_renderer( st_ivas, &output[channel_offset], output_frame );
@@ -194,9 +177,6 @@ ivas_error ivas_osba_dirac_td_binaural( 
    {

        ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, &output[channel_offset], st_ivas->nchan_transport );

    }

#else

    ivas_dirac_dec_binaural( st_ivas, st_ivas->hCombinedOrientationData, output, st_ivas->nchan_transport );

#endif



#ifdef DEBUG_OSBA

    {
@@ -230,15 +210,11 @@ ivas_error ivas_osba_dirac_td_binaural( 
#endif

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

    {

#if 0

        v_add( output[MAX_NUM_OBJECTS + n], p_sepobj[n], output[n], output_frame );

#else

        int16_t i;

        for ( i = 0; i < output_frame; i++ )

        {

            output[n][i] = 0.5f * output[channel_offset + n][i] + 0.5f * p_sepobj[n][i];

        }

#endif

    }



    return IVAS_ERR_OK;

lib_enc/ivas_osba_enc.c

100644 → 100755
+0 −4
Original line number Diff line number Diff line
@@ -198,11 +198,7 @@ ivas_error ivas_osba_enc_config( 


    hEncoderConfig = st_ivas->hEncoderConfig;



#if 0

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

#else

    st_ivas->ism_mode = ISM_MODE_NONE;

#endif



    /* reconfiguration in case of bitrate switching */

    if ( hEncoderConfig->last_ivas_total_brate != hEncoderConfig->ivas_total_brate )