Commit aa2404ba authored by bayers's avatar bayers
Browse files

fix a few remaining merge problems

parent 7cb7f985

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -2955,7 +2955,7 @@ static ivas_error decodeVoIP( 
    IsmFileWriter *ismWriters[IVAS_MAX_NUM_OBJECTS];

#ifdef NONBE_UNIFIED_DECODING_PATHS

    IVAS_VECTOR3 Pos[IVAS_MAX_PARAM_SPATIAL_SUBFRAMES] = { { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 }, { 0, 0, 0 } };

    int16_t vec_pos_update, vec_pos_len, i;

    int16_t vec_pos_update, vec_pos_len;

#if defined( SPLIT_REND_WITH_HEAD_ROT )

    uint16_t nOutSamples = 0;

#else

lib_dec/ivas_binRenderer_internal.c

+3 −1
Original line number Diff line number Diff line
@@ -1650,12 +1650,14 @@ void ivas_binaural_cldfb( 
            st_ivas->hCombinedOrientationData,

#ifndef NONBE_UNIFIED_DECODING_PATHS

            subframeIdx,

#endif            JBM_CLDFB_SLOTS_IN_SUBFRAME,

#endif            

            JBM_CLDFB_SLOTS_IN_SUBFRAME,

#ifdef SPLIT_REND_WITH_HEAD_ROT_DEBUG

            NULL,

#endif

            Cldfb_RealBuffer_Binaural, Cldfb_ImagBuffer_Binaural,

            Cldfb_RealBuffer, Cldfb_ImagBuffer );



#ifdef SPLIT_REND_WITH_HEAD_ROT

        if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

lib_dec/ivas_jbm_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ ivas_error ivas_jbm_dec_render( 
            /* Binaural rendering */

            if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

                if ( ( ivas_td_binaural_renderer_sf( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                {

                    return error;

                }
@@ -1054,7 +1054,7 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

                if ( ( ivas_td_binaural_renderer_sf( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_td_binaural_renderer_sf( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                {

                    return error;

                }
@@ -1107,7 +1107,7 @@ ivas_error ivas_jbm_dec_render( 
            }

            else if ( st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD )

            {

                if ( ( ivas_td_binaural_renderer( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                if ( ( error = ivas_td_binaural_renderer( st_ivas, p_output, *nSamplesRendered ) ) != IVAS_ERR_OK )

                {

                    return error;

                }

lib_dec/lib_dec.c

+5 −8
Original line number Diff line number Diff line
@@ -375,12 +375,12 @@ ivas_error IVAS_DEC_Configure( 
    IVAS_DEC_HANDLE hIvasDec,                          /* i/o: IVAS decoder handle                        */

    const uint32_t sampleRate,                         /* i  : output sampling frequency                  */

    const AUDIO_CONFIG outputConfig,                   /* i  : output configuration                       */

    const int16_t tsmEnabled,                          /* i  : enable time scale modification             */

#ifndef REMOVE_5MS_FLAG

    const int16_t enable5ms,

    const int16_t enable5ms,                           /* i  : enable 5ms rendering path                  */

#else

    const RENDER_FRAMESIZE renderFramesize,

    const RENDER_FRAMESIZE renderFramesize,            /* i  : rendering frame size                       */

#endif

    const int16_t enable5ms,                           /* i  : enable 5ms rendering path                  */

    const int16_t customLsOutputEnabled,               /* i  : enable custom loudspeaker setup handle     */

    const int16_t hrtfReaderEnabled,                   /* i  : enable HRTF binary file input              */

    const int16_t enableHeadRotation,                  /* i  : enable head rotation for binaural output   */
@@ -443,7 +443,9 @@ ivas_error IVAS_DEC_Configure( 
    }



    hDecoderConfig->Opt_tsm = tsmEnabled;

#ifndef REMOVE_5MS_FLAG

    hDecoderConfig->Opt_5ms = enable5ms;

#endif

    hDecoderConfig->Opt_LsCustom = customLsOutputEnabled;

    hDecoderConfig->Opt_Headrotation = enableHeadRotation;

    hDecoderConfig->orientation_tracking = orientation_tracking;
@@ -485,11 +487,6 @@ ivas_error IVAS_DEC_Configure( 
        hIvasDec->st_ivas->ivas_format = MONO_FORMAT;

    }



    hDecoderConfig->Opt_tsm = tsmEnabled;

#ifndef REMOVE_5MS_FLAG

    hDecoderConfig->Opt_5ms = enable5ms;

#endif



    hIvasDec->nSamplesFrame = (uint16_t) ( hDecoderConfig->output_Fs / FRAMES_PER_SEC );

    hIvasDec->nSamplesAvailableNext = 0;

    hIvasDec->nSamplesRendered = 0;

lib_rend/lib_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -3306,7 +3306,7 @@ static DecoderDummy *initDecoderDummy( 
#ifdef NONBE_UNIFIED_DECODING_PATHS

                                                       sampleRate,

#endif

                                                       num_subframes ) ) != IVAS_ERR_OK ) != IVAS_ERR_OK )

                                                       num_subframes ) ) != IVAS_ERR_OK )

        {

            assert( error == IVAS_ERR_OK );

        }