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

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec... 

Merge branch 'new-osba-baseline' of forge.3gpp.org:ivas-codec-pc/ivas-codec into new-osba-paseline_pc
parents 2a894ec0 e03dc9cc

apps/decoder.c

+3 −0
Original line number Diff line number Diff line
@@ -1950,6 +1950,9 @@ static ivas_error decodeG192( 
                    Quaternions[i].x = 0.0f;

                    Quaternions[i].y = 0.0f;

                    Quaternions[i].z = 0.0f;

                    Pos[i].x = 0.0f;

                    Pos[i].y = 0.0f;

                    Pos[i].z = 0.0f;

                }

            }

            else

lib_dec/ivas_objectRenderer_internal.c

+4 −0
Original line number Diff line number Diff line
@@ -57,7 +57,11 @@ ivas_error ivas_td_binaural_open( 
    int16_t num_src;



    num_src = st_ivas->nchan_transport;

#ifdef SBA_AND_OBJECTS

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

#else

    if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

#endif

    {

        num_src = st_ivas->nchan_ism;

    }

lib_rend/lib_rend.c

+3 −0
Original line number Diff line number Diff line
@@ -5095,6 +5095,9 @@ ivas_error IVAS_REND_SetHeadRotation( 
                hIvasRend->headRotData.headPositions[i].x = 0.0f;

                hIvasRend->headRotData.headPositions[i].y = 0.0f;

                hIvasRend->headRotData.headPositions[i].z = 0.0f;

                hIvasRend->headRotData.Pos[i].x = 0.0f;

                hIvasRend->headRotData.Pos[i].y = 0.0f;

                hIvasRend->headRotData.Pos[i].z = 0.0f;

            }

        }

        else