Commit 78b6266d authored by vaclav's avatar vaclav
Browse files

accept MASA_AND_OBJECTS and FIX_24k4_ISM1_MODE

parent bf1c0053

lib_com/bitstream.c

+2 −2
Original line number Diff line number Diff line
@@ -1812,7 +1812,7 @@ ivas_error preview_indices( 
                else

                {

                    st_ivas->ivas_format = MASA_FORMAT;

#ifdef MASA_AND_OBJECTS_VE

#ifdef MASA_AND_OBJECTS

                    if ( bit_stream[3] )

                    {

                        st_ivas->ivas_format = MASA_ISM_FORMAT;
@@ -1974,7 +1974,7 @@ ivas_error preview_indices( 


            ivas_sba_config( total_brate, st_ivas->sba_analysis_order, -1, &( st_ivas->nchan_transport ), st_ivas->sba_planar, &( st_ivas->nSCE ), &( st_ivas->nCPE ), &( st_ivas->element_mode_init ) );

        }

#ifdef MASA_AND_OBJECTS_VE

#ifdef MASA_AND_OBJECTS

        else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

        {

            /* read number of objects from the bitstream */

lib_com/ivas_omasa_com.c

+0 −10
Original line number Diff line number Diff line
@@ -74,20 +74,10 @@ ISM_MODE ivas_omasa_ism_mode_select( 
    switch ( no_obj )

    {

        case 1:

#ifdef FIX_24k4_ISM1_MODE

            if ( ivas_total_brate >= IVAS_24k4 )

#else

            if ( ivas_total_brate >= IVAS_32k )

#endif

            {

                ism_mode = ISM_MASA_MODE_DISC;

            }

#ifndef FIX_24k4_ISM1_MODE

            else if ( ivas_total_brate >= IVAS_24k4 )

            {

                ism_mode = ISM_MASA_MODE_PARAM;

            }

#endif

            else

            {

                ism_mode = ISM_MODE_NONE;

lib_com/options.h

+1 −2
Original line number Diff line number Diff line
@@ -161,8 +161,7 @@ 
#ifdef MASA_AND_OBJECTS

#define MASAISM_EDIT_OBJECTS                    /* Nokia: Temporary command line editing of object directions in the decoder */



#define FIX_24k4_ISM1_MODE // activate DISC mode at 24.4 kbps 1 object

#define MASA_AND_OBJECTS_VE // VA: improve codec print-outs



#define OMASA_BRATE /* VA: combined format bit-budget distribution */

#define OMASA_BRATE_TD // support of bitrate adaptation in TD stereo

lib_dec/lib_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -1880,7 +1880,7 @@ static ivas_error printConfigInfo_dec( 
            {

                fprintf( stdout, "Input configuration:    MASA - %d channel(s)\n", st_ivas->nchan_transport );

            }

#ifdef MASA_AND_OBJECTS_VE

#ifdef MASA_AND_OBJECTS

            else if ( st_ivas->ivas_format == MC_FORMAT )

#else

            else /* MC_FORMAT */
@@ -1893,7 +1893,7 @@ static ivas_error printConfigInfo_dec( 


                fprintf( stdout, "Input configuration:    %s\n", config_str );

            }

#ifdef MASA_AND_OBJECTS_VE

#ifdef MASA_AND_OBJECTS

            else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

            {

                fprintf( stdout, "Input configuration:    combined ISM and MASA (%i separated ISM stream(s)) \n", st_ivas->nchan_transport );

lib_enc/lib_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -1631,11 +1631,7 @@ static ivas_error printConfigInfo_enc( 
#ifdef MASA_AND_OBJECTS

    else if ( hEncoderConfig->ivas_format == MASA_ISM_FORMAT )

    {

#ifdef MASA_AND_OBJECTS_VE

        fprintf( stdout, "IVAS format:            combined ISM and MASA (%i ISM stream(s))\n", hEncoderConfig->nchan_inp - 2 );

#else

        fprintf( stdout, "IVAS format:            MASA and objects format\n" );

#endif

    }

#endif