Commit a8f6213e authored by sagnowski's avatar sagnowski
Browse files

Ensure changes are cleanly wrapped in SPLIT_REND_WITH_HEAD_ROT, another pass

parent 7f9e5b2a

lib_com/ivas_cnst.h

+0 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,6 @@ typedef enum 
#define SPLIT_REND_768k                               768000

#define SPLIT_REND_MAX_BRATE                          SPLIT_REND_768k

#define SPLIT_REND_ADDITIONAL_BYTES_TO_READ ( 1 )



#endif



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

lib_com/ivas_prot.h

+0 −11
Original line number Diff line number Diff line
@@ -4952,16 +4952,6 @@ void ivas_quantise_real_values( 
    const int16_t dim

);



#ifndef SPLIT_REND_WITH_HEAD_ROT

ivas_error ivas_deindex_real_index( 

	const int16_t *index, 

	const int16_t q_levels, 

	const float min_value, 

	const float max_value, 

	float *quant, 

	const int16_t num_ch_dim2 );



#endif

void ivas_spar_get_uniform_quant_strat(

    ivas_spar_md_com_cfg *pSpar_md_com_cfg,

    const int16_t table_idx
@@ -5180,7 +5170,6 @@ void ivas_binRenderer( 
#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

    HEAD_TRACK_DATA_HANDLE hPostRendHeadTrackData,

#endif



    COMBINED_ORIENTATION_HANDLE hCombinedOrientationData,       /* i  : combined head and external orientation handle           */

    int16_t subframe_idx,                                       /* i  : subframe index                                          */

    const int16_t numTimeSlots,                                 /* i: : number of time slots to process                         */

lib_dec/ivas_binRenderer_internal.c

+3 −1
Original line number Diff line number Diff line
@@ -306,6 +306,7 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
        }

    }

#else



    if ( ( hBinRenConvModule->filterStatesLeftReal = (float ***) malloc( hBinRenderer->conv_band * sizeof( float ** ) ) ) == NULL )

    {

        return ( IVAS_ERROR( IVAS_ERR_FAILED_ALLOC, "Can not allocate memory for Convolution Module \n" ) );
@@ -466,8 +467,8 @@ static ivas_error ivas_binRenderer_convModuleOpen( 
            }

        }

    }



#endif



    hBinRenderer->hBinRenConvModule = hBinRenConvModule;



    return IVAS_ERR_OK;
@@ -1074,6 +1075,7 @@ static void ivas_binRenderer_convModuleClose( 
    free( hBinRenConvModule->filterStatesLeftImag );

    hBinRenConvModule->filterStatesLeftImag = NULL;

#else /* SPLIT_REND_WITH_HEAD_ROT */



    for ( bandIdx = 0; bandIdx < ( *hBinRenderer )->conv_band; bandIdx++ )

    {

        for ( chIdx = 0; chIdx < ( *hBinRenderer )->nInChannels; chIdx++ )

lib_dec/ivas_spar_md_dec.c

+0 −2
Original line number Diff line number Diff line
@@ -82,9 +82,7 @@ static ivas_error ivas_spar_set_dec_config( ivas_spar_md_dec_state_t *hMdDec, co 


static void ivas_parse_parameter_bitstream_dtx( ivas_spar_md_t *pSpar_md, Decoder_State *st, const int16_t bw, const int16_t num_bands, int16_t *num_dmx_per_band, int16_t *num_dec_per_band );



#ifdef SPLIT_REND_WITH_HEAD_ROT

static ivas_error ivas_deindex_real_index( const int16_t *index, const int16_t q_levels, const float min_value, const float max_value, float *quant, const int16_t num_ch_dim2 );

#endif



static void ivas_spar_dec_parse_md_bs( ivas_spar_md_dec_state_t *hMdDec, Decoder_State *st, int16_t *nB, int16_t *bands_bw, int16_t *dtx_vad, const int32_t ivas_total_brate, const int16_t use_planar_coeff, const int16_t sba_inactive_mode, const int32_t last_active_brate );

lib_dec/lib_dec.c

+1 −3
Original line number Diff line number Diff line
@@ -1218,8 +1218,8 @@ ivas_error IVAS_DEC_FeedHeadTrackData( 
#else

    hIvasDec->st_ivas->hHeadTrackData->num_quaternions = 0;

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT



#ifdef SPLIT_REND_WITH_HEAD_ROT

    hHeadTrackData->sr_pose_pred_axis = rot_axis;

#endif
@@ -1613,9 +1613,7 @@ ivas_error IVAS_DEC_GetDelay( 
#else

    nSamples[1] = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0] ) );

#endif



    nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f );



    nSamples[0] = nSamples[1] + nSamples[2];



    if ( st_ivas->ivas_format == MASA_FORMAT )