Commit d85b7c9b authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

enable object editing for OSBA

parent cfd6eeef

lib_dec/ivas_init_dec.c

+5 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,11 @@ ivas_error ivas_init_decoder( 
           st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV_ROOM ||

           st_ivas->renderer_type == RENDERER_BINAURAL_MIXER_CONV_ROOM

#ifdef OBJ_EDITING_DECODER

           || st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM || st_ivas->renderer_type == RENDERER_DISABLE

           || st_ivas->renderer_type == RENDERER_BINAURAL_OBJECTS_TD

		   || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC

		   || st_ivas->renderer_type == RENDERER_BINAURAL_PARAMETRIC_ROOM

		   || st_ivas->renderer_type == RENDERER_DISABLE

		   || st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC

#endif

           ) )

    {

lib_dec/ivas_objectRenderer_internal.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ ivas_error ivas_td_binaural_renderer_sf( 
        if ( subframe_idx == ism_md_subframe_update_jbm )

        {

#ifdef OBJ_EDITING_DECODER

            if ( st_ivas->ivas_format == ISM_FORMAT )

            if ( st_ivas->ivas_format == ISM_FORMAT || st_ivas->ivas_format == SBA_ISM_FORMAT )

            {

                ISM_METADATA_FRAME ismMetaData[MAX_NUM_OBJECTS];

                ISM_METADATA_HANDLE hIsmMetaData[MAX_NUM_OBJECTS];

lib_dec/lib_dec.c

+22 −1
Original line number Diff line number Diff line
@@ -2121,7 +2121,28 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
        }

		else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC )

		{



			if (st_ivas->hIsmRendererData->has_been_edited)

			{

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

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

				metadata->radius = st_ivas->hIsmRendererData->edited_radius[objectIdx];

				metadata->yaw = st_ivas->hIsmRendererData->edited_yaw[objectIdx];

				metadata->pitch = st_ivas->hIsmRendererData->edited_pitch[objectIdx];

				metadata->spread = 0.f;

				metadata->gainFactor = st_ivas->hIsmRendererData->edited_gains[objectIdx];

				metadata->non_diegetic_flag = st_ivas->hIsmRendererData->non_diegetic_flag[objectIdx];

			}

			else

			{

				metadata->azimuth = hIsmMeta->azimuth;

				metadata->elevation = hIsmMeta->elevation;

				metadata->radius = hIsmMeta->radius;

				metadata->yaw = hIsmMeta->yaw;

				metadata->pitch = hIsmMeta->pitch;

				metadata->spread = 0.f;

				metadata->gainFactor = 1.f;

				metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

			}

		}

#else

        metadata->azimuth = hIsmMeta->azimuth;