Commit 0e14fc1c authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

clean up code

parent 116df66f

apps/decoder.c

+3 −7
Original line number Diff line number Diff line
@@ -155,11 +155,9 @@ typedef struct 
    AcousticEnvironmentSequence aeSequence;

    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_EXAMPLE

    bool objEditEnabled;

#endif

#endif

} DecArguments;
@@ -1100,11 +1098,10 @@ static bool parseCmdlIVAS_dec( 
        arg->directivityPatternId[i] = 65535;

    }



#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_EXAMPLE

    arg->objEditEnabled = false;

#endif

#endif

#





    /*-----------------------------------------------------------------*
@@ -1559,14 +1556,13 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifdef OBJ_EDITING_API



#ifdef OBJ_EDITING_EXAMPLE

        else if ( strcmp( argv_to_upper, "-OBJ_EDIT" ) == 0 )

        {

            arg->objEditEnabled = true;

            i++;

        }

#endif

#endif



        /*-----------------------------------------------------------------*
@@ -2446,7 +2442,7 @@ static ivas_error decodeG192( 
#endif

                /* Feed into decoder */

                if ( ( error = IVAS_DEC_FeedFrame_Serial( hIvasDec, bit_stream, num_bits, bfi

#if defined( OBJ_EDITING_API )

#ifdef OBJ_EDITING_API

                                                          ,

                                                          isSplitRend,

                                                          splitRendBits

lib_dec/ivas_ism_param_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -1403,6 +1403,7 @@ void ivas_param_ism_dec_render( 
            {

                st_ivas->hIsmMetaData[ch]->azimuth = st_ivas->hParamIsmDec->azimuth_values[ch];

            }



            st_ivas->hIsmMetaData[ch]->elevation = st_ivas->hParamIsmDec->elevation_values[ch];

#endif

        }

lib_dec/ivas_ism_renderer.c

+0 −34
Original line number Diff line number Diff line
@@ -610,37 +610,3 @@ void ivas_omasa_separate_object_render_jbm( 


    return;

}
 


#if 0

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

 * ivas_ism_renderer_update_md()

 *

 * set renderer ISM MD to the bitstream ISM MD values

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

void ivas_ism_renderer_update_md(

    Decoder_Struct *st_ivas /* i/o:  main IVAS decoder handle */

)

{

    ISM_RENDERER_HANDLE hIsmRenderer;

    int16_t num_obj, obj_idx;





    num_obj = st_ivas->nchan_ism;

    hIsmRenderer = st_ivas->hIsmRendererData;



    for ( obj_idx = 0; obj_idx < num_obj; obj_idx++ )

    {

        hIsmRenderer->edited_azimuth[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->azimuth;

        hIsmRenderer->edited_elevation[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->elevation;

        hIsmRenderer->edited_radius[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->radius;

        hIsmRenderer->edited_yaw[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->yaw;

        hIsmRenderer->edited_pitch[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->pitch;

        hIsmRenderer->edited_gains[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->gain;

        hIsmRenderer->non_diegetic_flag[obj_idx] = st_ivas->hIsmMetaData[obj_idx]->non_diegetic_flag;

    }



    return;

}





#endif

lib_dec/ivas_jbm_dec.c

+0 −7
Original line number Diff line number Diff line
@@ -187,13 +187,6 @@ ivas_error ivas_jbm_dec_tc( 
            hp20( p_output[n], output_frame, st_ivas->mem_hp20_out[n], output_Fs );

        }



#if 0

        if ( st_ivas->ism_mode != ISM_MODE_PARAM && ( st_ivas->hDecoderConfig->output_config != IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->renderer_type != RENDERER_MONO_DOWNMIX ) )

        {

            ivas_ism_renderer_update_md( st_ivas );

        }

#endif



        if ( st_ivas->renderer_type == RENDERER_MONO_DOWNMIX )

        {

            ivas_ism_mono_dmx( st_ivas, p_output, output_frame );

lib_dec/ivas_mc_param_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1352,7 +1352,6 @@ void ivas_param_mc_dec_digest_tc( 
    set_s( channel_active, 0, MAX_CICP_CHANNELS );

#endif

    nchan_transport = st_ivas->nchan_transport;



#ifndef OBJ_EDITING_API

    nchan_out_transport = st_ivas->hTransSetup.nchan_out_woLFE + st_ivas->hTransSetup.num_lfe;
@@ -1405,6 +1404,7 @@ void ivas_param_mc_dec_digest_tc( 
        set_zero( cx_imag[param_band_idx], PARAM_MC_MAX_TRANSPORT_CHANS * PARAM_MC_MAX_TRANSPORT_CHANS );

    }

#endif



    /* slot loop for gathering the input data */

    for ( slot_idx = 0; slot_idx < nCldfbSlots; slot_idx++ )

    {