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

simplify function ivas_osba_ism_mode_select

parent c7ea6e49

Workspace_msvc/lib_com.vcxproj.filters

+3 −0
Original line number Diff line number Diff line
@@ -469,6 +469,9 @@ 
    <ClCompile Include="..\lib_com\ivas_lfe_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_osba_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\basop_proto_func.h">

lib_com/ivas_osba_com.c

+4 −14
Original line number Diff line number Diff line
@@ -40,37 +40,27 @@ 
#endif



/*! r : ISM format mode */

int16_t ivas_osba_ism_mode_select(

ISM_MODE ivas_osba_ism_mode_select(

    const int32_t ivas_total_brate, /* i  : IVAS total bitrate      */

    const int16_t nchan_ism         /* i  : number of input ISM's   */

)

{

    int16_t ism_mode = 0;

    ISM_MODE ism_mode = ISM_MODE_NONE;



    switch ( nchan_ism )

    {

        case 1:

            if ( ivas_total_brate >= IVAS_96k )

            {

                ism_mode = 1;

                ism_mode = ISM_SBA_MODE_DISC;

            }

            break;

        case 2:

            if ( ivas_total_brate >= IVAS_128k )

            {

                ism_mode = 1;

            }

            break;

        case 3:

            if ( ivas_total_brate >= IVAS_128k )

            {

                ism_mode = 1;

            }

            break;

        case 4:

            if ( ivas_total_brate >= IVAS_128k )

            {

                ism_mode = 1;

                ism_mode = ISM_SBA_MODE_DISC;

            }

            break;

    }

lib_com/ivas_prot.h

+1 −1
Original line number Diff line number Diff line
@@ -5617,7 +5617,7 @@ void ivas_osba_data_close( 
    SBA_ISM_DATA_HANDLE *hSbaIsmData                            /* i/o: OSBA rendering handle                   */

);



int16_t ivas_osba_ism_mode_select(

ISM_MODE ivas_osba_ism_mode_select(

    const int32_t ivas_total_brate,                             /* i  : IVAS total bitrate      */

    const int16_t nchan_ism                                     /* i  : number of input ISM's   */

);

lib_dec/ivas_init_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ ivas_error ivas_dec_setup( 
            st_ivas->nchan_ism = 2 * st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 1] + st_ivas->bit_stream[ivas_total_brate / FRAMES_PER_SEC - 2] + 1;



#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( ivas_total_brate < IVAS_24k4 || ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) )

            if ( ivas_total_brate < IVAS_24k4 || ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC ) )

#else

            if ( ivas_total_brate < IVAS_24k4 || ivas_total_brate >= IVAS_256k )

#endif
@@ -485,7 +485,7 @@ ivas_error ivas_dec_setup( 


            /* read Ambisonic (SBA) order */

#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( !ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) )

            if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) != ISM_SBA_MODE_DISC )

#else

            if ( ivas_total_brate < IVAS_256k )

#endif
@@ -527,7 +527,7 @@ ivas_error ivas_dec_setup( 
                }

            }

#ifdef NONBE_FIX_ISM_XOVER_BR

            if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) )

            if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC)

#else

            if ( ivas_total_brate >= IVAS_256k )

#endif

lib_dec/ivas_sba_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ ivas_error ivas_sba_dec_reconfigure( 
    if ( st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

#ifdef NONBE_FIX_ISM_XOVER_BR

        if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) )

        if ( ivas_osba_ism_mode_select( ivas_total_brate, st_ivas->nchan_ism ) == ISM_SBA_MODE_DISC)

#else

        if ( ivas_total_brate >= IVAS_256k )

#endif