Commit 7ed892e6 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

emporatily disable check for st_ivas->hIsmRendererData->has_been_edited

parent d2c58422

lib_dec/ivas_ism_renderer.c

+2 −2
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ void ivas_ism_render_sf( 
                      does not recover the same output as without the object-editing feature.

                      Therefore, the smoothed unedited values must be used here, when no editing has been performed.

                    */

                    if ( st_ivas->hIsmRendererData->has_been_edited )

                    if ( 1 )

                    {

                        rotateAziEle( st_ivas->hIsmRendererData->edited_azimuth[i], st_ivas->hIsmRendererData->edited_elevation[i], &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );

                    }
@@ -263,7 +263,7 @@ void ivas_ism_render_sf( 
                else

                {

#ifdef OBJ_EDITING_DECODER

                    if ( st_ivas->hIsmRendererData->has_been_edited )

                    if ( 1 )

                    {

                        rotateAziEle( st_ivas->hIsmRendererData->last_edited_azimuth[i], st_ivas->hIsmRendererData->last_edited_elevation[i], &azimuth, &elevation, st_ivas->hCombinedOrientationData->Rmat[st_ivas->hCombinedOrientationData->subframe_idx], st_ivas->hIntSetup.is_planar_setup );

                    }

lib_dec/lib_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -2123,7 +2123,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
#ifdef OBJ_EDITING_DECODER

        if ( st_ivas->ism_mode == ISM_MODE_DISC )

        {

            if ( st_ivas->hIsmRendererData->has_been_edited )

            if ( 1 )

            {

                metadata->azimuth = st_ivas->hIsmRendererData->edited_azimuth[objectIdx];

                metadata->elevation = st_ivas->hIsmRendererData->edited_elevation[objectIdx];
@@ -2149,7 +2149,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
#ifdef OBJ_EDITING_PARAMISM

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            if ( st_ivas->hParamIsmDec->has_been_edited )

            if ( 1 )

            {

                metadata->azimuth = st_ivas->hParamIsmDec->edited_azimuth_values[objectIdx];

                metadata->elevation = st_ivas->hParamIsmDec->edited_elevation_values[objectIdx];
@@ -2169,7 +2169,7 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
#endif

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            if ( st_ivas->hIsmRendererData->has_been_edited )

            if ( 1 )

            {

                metadata->azimuth = st_ivas->hIsmRendererData->edited_azimuth[objectIdx];

                metadata->elevation = st_ivas->hIsmRendererData->edited_elevation[objectIdx];