Commit 4cf7e201 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

clean up experimental code changes

parent b1017824

Workspace_msvc/decoder.vcxproj

+1 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
      <CompileAs>Default</CompileAs>

      <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>

      <TreatWarningAsError>false</TreatWarningAsError>

      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>

    </ClCompile>

    <ResourceCompile>

      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

lib_com/common_api_types.h

+0 −1
Original line number Diff line number Diff line
@@ -139,7 +139,6 @@ typedef struct _IVAS_EDITABLE_PARAMETERS 
{

    int16_t num_obj;

    IVAS_ISM_METADATA ism_metadata[IVAS_MAX_NUM_OBJECTS];

    float gain_bed;

} IVAS_EDITABLE_PARAMETERS;

#endif

lib_dec/ivas_stat_dec.h

+0 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ typedef struct ivas_param_ism_dec_data_structure 
#ifdef OBJ_EDITING_PARAMISM

    float edited_azimuth_values[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS];

    float edited_elevation_values[MAX_PARAM_SPATIAL_SUBFRAMES * IVAS_MAX_NUM_BANDS];

    float edited_power_ratios[MAX_PARAM_ISM_NBANDS][MAX_PARAM_ISM_NBLOCKS][MAX_PARAM_ISM_WAVE];

    int16_t has_been_edited;

#endif

lib_dec/lib_dec.c

+1 −4
Original line number Diff line number Diff line
@@ -918,10 +918,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
#ifdef OBJ_EDITING_API

    /* decode TCs, do TSM and feed to renderer */

    /* setup */

    if ( !hIvasDec->hasBeenFedFirstGoodFrame )

    {

    }

    else

    if ( hIvasDec->hasBeenFedFirstGoodFrame )

    {

        uint16_t l_ts, nTimeScalerOutSamples;

        uint8_t nTransportChannels, nOutChannels;

lib_rend/ivas_objectRenderer_sources.c

+0 −31
Original line number Diff line number Diff line
@@ -181,37 +181,6 @@ ivas_error TDREND_MIX_SRC_SetDistAtten( 
    return IVAS_ERR_OK;

}



#if 0

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

 * TDREND_MIX_SRC_SetSrcGain()

 *

 * Set the source (i.e. overall gain) for a source for the mixer.

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



ivas_error TDREND_MIX_SRC_SetSrcGain(

    BINAURAL_TD_OBJECT_RENDERER_HANDLE hBinRendererTd, /* i/o: TD renderer handle                */

    const int16_t SrcInd,                              /* i  : Source index                      */

    const float SrcGain_p                              /* i  : Source gain                       */

)

{

    if ( SrcInd > hBinRendererTd->MaxSrcInd )

    {

        return ( IVAS_ERROR( IVAS_ERR_INVALID_INDEX, "Index exceeds max index\n" ) );

    }

    else if ( SrcGain_p < *hBinRendererTd->Sources[SrcInd]->SrcRend_p->SrcGainMin_p || SrcGain_p > *hBinRendererTd->Sources[SrcInd]->SrcRend_p->SrcGainMax_p )

    {

        return ( IVAS_ERROR( IVAS_ERR_INVALID_INDEX, "gain exceeds gain limits\n" ) );

    }

    else

    {

        *hBinRendererTd->Sources[SrcInd]->SrcRend_p->SrcGain_p = SrcGain_p;

        hBinRendererTd->Sources[SrcInd]->SrcRend_p->SrcGainUpdated = TRUE;

    }



    return IVAS_ERR_OK;

}

#endif





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

 * TDREND_MIX_SRC_SetPlayState()