Commit 68da9eef authored by multrus's avatar multrus
Browse files

Merge branch 'new-osba-baseline' into 'main' 

[ref-using-main] New osba baseline

See merge request !811
parents ffc0f806 42afc22c

Workspace_msvc/lib_dec.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c" />

    <ClCompile Include="..\lib_dec\ivas_osba_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_output_config.c" />

    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+2 −1
Original line number Diff line number Diff line
@@ -515,6 +515,7 @@ 
    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_osba_dec.c">

    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c">

      <Filter>dec_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_enc.vcxproj

+2 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+2 −1
Original line number Diff line number Diff line
@@ -590,6 +590,7 @@ 
    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />

    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c">

      <Filter>enc_ivas_c</Filter>

    </ClCompile>

apps/decoder.c

+19 −4
Original line number Diff line number Diff line
@@ -81,7 +81,11 @@ static 
#define MAX_FRAME_SIZE ( 48000 / 50 )

#endif

#define MAX_NUM_OUTPUT_CHANNELS 16

#ifdef SBA_AND_OBJECTS

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( ( MAX_NUM_OUTPUT_CHANNELS + IVAS_MAX_NUM_OBJECTS ) * MAX_FRAME_SIZE )

#else

#define MAX_OUTPUT_PCM_BUFFER_SIZE ( MAX_NUM_OUTPUT_CHANNELS * MAX_FRAME_SIZE )

#endif

#ifdef SPLIT_REND_WITH_HEAD_ROT

#define MAX_SPLIT_REND_BITRATE                   ( 768000 ) /* TODO tmu: unify with SPLIT_REND_MAX_BRATE ? */

#define MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES ( ( ( (int32_t) MAX_SPLIT_REND_BITRATE / NUM_FRAMES_PER_SEC ) + 7 ) >> 3 )
@@ -1756,10 +1760,14 @@ static ivas_error initOnFirstGoodFrame( 
            fprintf( stderr, "\nError in IVAS_DEC_GetFormat, code: %d\n", error );

            return error;

        }



        /* If outputting ISM, get number of objects, open output files and write zero metadata for initial bad frames */

#ifdef MASA_AND_OBJECTS

        if ( *pBsFormat == IVAS_DEC_BS_OBJ || *pBsFormat == IVAS_DEC_BS_MASA_ISM )

        if ( *pBsFormat == IVAS_DEC_BS_OBJ || *pBsFormat == IVAS_DEC_BS_MASA_ISM

#ifdef SBA_AND_OBJECTS



             || *pBsFormat == IVAS_DEC_BS_SBA_ISM

#endif

        )

#else

        if ( *pBsFormat == IVAS_DEC_BS_OBJ )

#endif
@@ -2014,6 +2022,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
@@ -2171,7 +2182,11 @@ static ivas_error decodeG192( 
        if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )

        {

#ifdef MASA_AND_OBJECTS

            if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM )

            if ( bsFormat == IVAS_DEC_BS_OBJ || bsFormat == IVAS_DEC_BS_MASA_ISM

#ifdef SBA_AND_OBJECTS

                 || bsFormat == IVAS_DEC_BS_SBA_ISM

#endif

            )

#else

            if ( bsFormat == IVAS_DEC_BS_OBJ )

#endif