Commit c4a157ed authored by bayers's avatar bayers
Browse files

further changes for the combined orientation read index handling

parent 9a020307

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ 
#define NONBE_FIX_736_FOA_BR_SWITCH                           /* FhG/Dlb : Issue 736: FOA bitrate switching decoding crashes in in ivas_spar_to_dirac */

#define NONBE_FIX_746_NONDIEGETIC_MD                          /* Eri: Issue 746: The non-diegetic panning flag affects the encoder bitstream even if extended metadata is not enabled. Crashes the decoder.*/

#define NONBE_UNIFIED_DECODING_PATHS                          /* FhG: unify decoding paths   */



/* ##################### End NON-BE switches ############################# */



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_binRenderer_internal.c

+2 −2
Original line number Diff line number Diff line
@@ -1706,7 +1706,7 @@ void ivas_binaural_cldfb( 
#endif

#ifdef NONBE_UNIFIED_DECODING_PATHS

        /* update combined orientation access index */

        ivas_combined_rotation_update_index( st_ivas->hCombinedOrientationData, maxBand * MAX_PARAM_SPATIAL_SUBFRAMES );

        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, maxBand * MAX_PARAM_SPATIAL_SUBFRAMES );

#endif

        /* Implement CLDFB synthesis */

        for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )
@@ -1865,7 +1865,7 @@ void ivas_binaural_cldfb_sf( 
#endif

#ifdef NONBE_UNIFIED_DECODING_PATHS

        /* update combined orientation access index */

        ivas_combined_rotation_update_index( st_ivas->hCombinedOrientationData, maxBand * st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] );

        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, maxBand * st_ivas->hTcBuffer->subframe_nbslots[subframeIdx] );

#endif

        /* Implement CLDFB synthesis */

        for ( ch = 0; ch < BINAURAL_CHANNELS; ch++ )

lib_dec/ivas_dec.c

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ ivas_error ivas_dec( 
    {

        return error;

    }

#else

    ivas_combined_orientation_set_to_start_index( st_ivas->hCombinedOrientationData );

#endif

#if defined SPLIT_REND_WITH_HEAD_ROT

    if ( ( output_config == AUDIO_CONFIG_BINAURAL_SPLIT_CODED ) ||
@@ -1095,6 +1097,10 @@ ivas_error ivas_dec( 
        }

    }



#ifdef NONBE_UNIFIED_DECODING_PATHS

    /* update global combined orientation start index */

    ivas_combined_orientation_update_start_index( st_ivas->hCombinedOrientationData, output_frame );

#endif



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

     * Write IVAS output channels

lib_dec/ivas_dirac_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1651,7 +1651,7 @@ void ivas_dirac_dec( 
            output_f_local[n] += n_samples_sf;

        }

#ifdef NONBE_UNIFIED_DECODING_PATHS

        ivas_combined_rotation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

#endif

    }
@@ -1735,7 +1735,7 @@ void ivas_dirac_dec_render( 
        }

#ifdef NONBE_UNIFIED_DECODING_PATHS

        /* update combined orientation access index */

        ivas_combined_rotation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

        ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_sf );

#endif

    }

lib_dec/ivas_ism_renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ void ivas_ism_render_sf( 
    }

#ifdef NONBE_UNIFIED_DECODING_PATHS

    /* update combined orientation access index */

    ivas_combined_rotation_update_index( st_ivas->hCombinedOrientationData, n_samples_to_render );

    ivas_combined_orientation_update_index( st_ivas->hCombinedOrientationData, n_samples_to_render );

#endif



    return;