Commit 510da55d authored by vaclav's avatar vaclav
Browse files

- port No. 223 (with parts from No. 221) and No. 331

parent bf60c206

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int main( 
    if ( arg.hrtfReaderEnabled )

    {

        /* sanity check */

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB )

        if ( arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_IR && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED && arg.outputConfig != IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

        {

            arg.hrtfReaderEnabled = false;

            fprintf( stderr, "\nError: HRTF binary file cannot be used in this output configuration.\n\n" );

lib_dec/lib_dec_fx.c

+5 −2
Original line number Diff line number Diff line
@@ -2837,10 +2837,13 @@ ivas_error IVAS_DEC_FeedRenderConfig( 
        hRenderConfig->split_rend_config.poseCorrectionMode = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    }



    IF( is_split_rendering_enabled( hIvasDec->st_ivas->hDecoderConfig, hRenderConfig ) )

    {

        IF( ( error = isar_split_rend_validate_config( &hRenderConfig->split_rend_config, ( hIvasDec->st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM ) ? 1 : 0 ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }



    return IVAS_ERR_OK;

}

lib_rend/lib_rend.h

+48 −46
Original line number Diff line number Diff line
@@ -253,12 +253,12 @@ ivas_error IVAS_REND_InitConfig( 
);



Word16 IVAS_REND_GetRenderConfig(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS decoder handle                                 */

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const IVAS_RENDER_CONFIG_HANDLE hRCout          /* o  : Render configuration handle                         */

);



Word16 IVAS_REND_FeedRenderConfig(

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS decoder handle                                 */

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const IVAS_RENDER_CONFIG_DATA renderConfig      /* i  : Render configuration struct                         */

);
@@ -411,7 +411,8 @@ void IVAS_REND_cldfbAnalysis_ts_wrapper( 
    const Word16 samplesToProcess,                 /* i  : samples to process  */

    IVAS_CLDFB_FILTER_BANK_HANDLE h_cldfb,         /* i  : filterbank state    */

    Word16 Q_in,

    Word16 *Q_out );

    Word16 *Q_out 

);



void IVAS_REND_cldfbSynthesis_wrapper(

    Word32 **realBuffer,                   /* i  : real values                 */
@@ -420,7 +421,8 @@ void IVAS_REND_cldfbSynthesis_wrapper( 
    const int16_t samplesToProcess,        /* i  : number of processed samples */

    IVAS_CLDFB_FILTER_BANK_HANDLE h_cldfb, /* i  : filter bank state           */

    Word16 Q_cldfb,

    Word16 *Q_out );

    Word16 *Q_out 

);





/* Disclaimer and info printing */

lib_rend/lib_rend_fx.c

+154 −42

File changed.

Preview size limit exceeded, changes collapsed.