Commit 5df8a02f authored by bayers's avatar bayers
Browse files

fix split rendering with rendering to time domain

parent 5c55b5eb

lib_com/options.h

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ 


/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



/*#define SPLIT_REND_WITH_HEAD_ROT*/                      /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define SPLIT_REND_PRED_QUANT_63_PNTS

#define SPLIT_REND_WITH_HEAD_ROT_PARAMBIN               /* Nokia: Issue 623: Split rendering support for parambin renderer */

lib_dec/ivas_jbm_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -1616,7 +1616,11 @@ ivas_error ivas_jbm_dec_render( 
        if ( st_ivas->ivas_format != MONO_FORMAT )

        {

#ifndef DISABLE_LIMITER

#ifdef SPLIT_REND_WITH_HEAD_ROT

            ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out_syn_output, *nSamplesRendered, st_ivas->BER_detect );

#else

            ivas_limiter_dec( st_ivas->hLimiter, p_output, nchan_out, *nSamplesRendered, st_ivas->BER_detect );

#endif

#endif

        }

    }
@@ -1638,7 +1642,7 @@ ivas_error ivas_jbm_dec_render( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

            break;

        case PCM_FLOAT32:

            ivas_syn_output_f( p_output, *nSamplesRendered, nchan_out, (float *) data );

            ivas_syn_output_f( p_output, *nSamplesRendered, nchan_out_syn_output, (float *) data );

            break;

        default:

            error = IVAS_ERR_UNKNOWN;

lib_dec/ivas_objectRenderer_internal.c

+3 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
    BINAURAL_TD_OBJECT_RENDERER_HANDLE origTdRendHandle;

    ivas_error error;

    int16_t original_subframes_rendered;

    int16_t original_slots_rendered;

    float *p_bin_output[BINAURAL_CHANNELS];



    push_wmops( "ivas_td_binaural_renderer_sf_splitBinaural" );
@@ -342,6 +343,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
    }



    original_subframes_rendered = st_ivas->hTcBuffer->subframes_rendered;

    original_slots_rendered = st_ivas->hTcBuffer->slots_rendered;

    origTdRendHandle = st_ivas->hBinRendererTd;



    for ( pos_idx = 0; pos_idx < pMultiBinPoseData->num_poses; pos_idx++ )
@@ -380,6 +382,7 @@ ivas_error ivas_td_binaural_renderer_sf_splitBinaural( 
            p_bin_output[i] = output[pos_idx * BINAURAL_CHANNELS + i];

        }

        st_ivas->hTcBuffer->subframes_rendered = original_subframes_rendered;

        st_ivas->hTcBuffer->slots_rendered = original_slots_rendered;

        ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData );



        /* Render */