Commit 8a4ca2b6 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Remove dependency on prot_fx.c in decoder.c and also remove math.h include as unnecessary.

parent 7c2942d7

apps/decoder.c

+7 −11
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ 


#include "lib_dec.h"

#include <string.h>

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include <math.h>

#endif

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"
@@ -56,7 +53,6 @@ 
#include "vector3_pair_file_reader.h"

#include "wmc_auto.h"

#include "options.h"

#include "prot_fx.h"

#include "stl.h"
@@ -3512,7 +3508,7 @@ static void do_object_editing_fx( 


        if ( readInfo->bg_gain_edited )

        {

            editableParameters->gain_bed_fx = float_to_fix( readInfo->bg_gain, Q29 );

            editableParameters->gain_bed_fx = (Word32) readInfo->bg_gain * 536870912; /* Q29 */

        }



        for ( obj_idx = 0; obj_idx < editableParameters->num_obj; obj_idx++ )
@@ -3525,11 +3521,11 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_azi_relative[obj_idx] )

                    {

                        /* azimuth: apply relative edit + wrap */

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = ( ( editableParameters->ism_metadata[obj_idx].azimuth_fx + float_to_fix( readInfo->obj_azi[obj_idx], Q22 ) + 2264924160 ) % 1509949440 ) - 754974720;

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = ( ( editableParameters->ism_metadata[obj_idx].azimuth_fx + (Word32) readInfo->obj_azi[obj_idx] * 4194304 + 2264924160 ) % 1509949440 ) - 754974720; /* Q22 */

                    }

                    else

                    {

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = float_to_fix( readInfo->obj_azi[obj_idx], Q22 );

                        editableParameters->ism_metadata[obj_idx].azimuth_fx = (Word32) readInfo->obj_azi[obj_idx] * 4194304; /* Q22 */

                    }

                }

                if ( readInfo->obj_ele_edited[obj_idx] )
@@ -3537,11 +3533,11 @@ static void do_object_editing_fx( 
                    if ( readInfo->obj_ele_relative[obj_idx] )

                    {

                        /* elevation: apply relative edit + saturation */

                        editableParameters->ism_metadata[obj_idx].elevation_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].elevation_fx + float_to_fix( readInfo->obj_ele[obj_idx], Q22 ), 377487360 ), -377487360 );

                        editableParameters->ism_metadata[obj_idx].elevation_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].elevation_fx + (Word32) readInfo->obj_ele[obj_idx] * 4194304, 377487360 ), -377487360 ); /* Q22 */

                    }

                    else

                    {

                        editableParameters->ism_metadata[obj_idx].elevation_fx = float_to_fix( readInfo->obj_ele[obj_idx], Q22 );

                        editableParameters->ism_metadata[obj_idx].elevation_fx = (Word32) readInfo->obj_ele[obj_idx] * 4194304; /* Q22 */

                    }

                }

            }
@@ -3552,11 +3548,11 @@ static void do_object_editing_fx( 
                if ( readInfo->obj_gain_relative[obj_idx] )

                {

                    /* gain: apply relative edit + saturation */

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * float_to_fix( readInfo->obj_gain[obj_idx], Q29 ), OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX );

                    editableParameters->ism_metadata[obj_idx].gain_fx = L_max( L_min( editableParameters->ism_metadata[obj_idx].gain_fx * (Word32) readInfo->obj_gain[obj_idx] * 536870912, OBJ_EDIT_GAIN_MAX_FX ), OBJ_EDIT_GAIN_MIN_FX ); /* Q29 */

                }

                else

                {

                    editableParameters->ism_metadata[obj_idx].gain_fx = float_to_fix( readInfo->obj_gain[obj_idx], Q29 );

                    editableParameters->ism_metadata[obj_idx].gain_fx = (Word32) readInfo->obj_gain[obj_idx] * 536870912; /* Q29 */

                }

            }

        }