Commit fe7fb005 authored by advasila's avatar advasila
Browse files

OMASA EXT code review 1

parent 8938c3e8

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -387,7 +387,7 @@ ivas_error ivas_dec_setup( 
            }



#ifdef OMASA_EXT_OUTPUT

            /* this should be non-zero if original input format was MASA_ISM */

            /* this should be non-zero if original input format was MASA_ISM_FORMAT */

            st_ivas->nchan_ism = st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 3] + 2 * st_ivas->bit_stream[( ivas_total_brate / FRAMES_PER_SEC ) - 2];



            if ( st_ivas->nchan_ism > 0 )
@@ -1159,7 +1159,7 @@ ivas_error ivas_init_decoder( 
            hDecoderConfig->nchan_out += st_ivas->nchan_ism;

        }

#ifdef OMASA_EXT_OUTPUT

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || st_ivas->ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || ( st_ivas->ism_mode == ISM_MODE_NONE && st_ivas->ivas_format == MASA_FORMAT ) )

        else if ( st_ivas->ivas_format == MASA_ISM_FORMAT || st_ivas->ivas_format == MASA_FORMAT )

#else

        else if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

#endif

lib_dec/ivas_jbm_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ ivas_error ivas_jbm_dec_tc( 
        {

            ivas_masa_prerender( st_ivas, p_output, output_frame, nchan_remapped );

#ifdef OMASA_EXT_OUTPUT



            /* external output */

            if ( st_ivas->hDecoderConfig->output_config == IVAS_AUDIO_CONFIG_EXTERNAL && st_ivas->hMasa->config.input_ivas_format == MASA_ISM_FORMAT )

            {

lib_dec/ivas_masa_dec.c

+1 −0
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ ivas_error ivas_masa_decode( 
                }

            }

#ifdef OMASA_EXT_OUTPUT



            /* read 2 bits:

                          '00' - MASA format at the encoder

                          '01' - MASA_ISM_FORMAT at the encoder, with 1 object

lib_dec/ivas_stat_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -920,6 +920,7 @@ typedef struct ivas_masa_ism_data_structure 
#ifdef OMASA_EXT_OUTPUT

    MASA_ISM_EXT_DATA_HANDLE hExtData;

#endif



} MASA_ISM_DATA, *MASA_ISM_DATA_HANDLE;

lib_dec/lib_dec.c

+3 −0
Original line number Diff line number Diff line
@@ -1438,11 +1438,13 @@ ivas_error IVAS_DEC_GetNumObjects( 
    int16_t is_masa_ism;

    is_masa_ism = 0;

#endif



    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }

#ifdef OMASA_EXT_OUTPUT



    if ( hIvasDec->st_ivas->hMasa != NULL )

    {

        if ( hIvasDec->st_ivas->hMasa->config.input_ivas_format == MASA_ISM_FORMAT )
@@ -1493,6 +1495,7 @@ ivas_error IVAS_DEC_GetFormat( 
        *format = IVAS_DEC_BS_MASA_ISM;

    }

#endif



    return IVAS_ERR_OK;

}

lib_com/ivas_prot.h

+10 −10

File changed.

Contains only whitespace changes.