Commit 3fddf874 authored by vaclav's avatar vaclav
Browse files

accept OMASA_EXT_OUTPUT

parent 230ea69f

apps/decoder.c

+14 −14
Original line number Diff line number Diff line
@@ -1742,7 +1742,7 @@ static ivas_error initOnFirstGoodFrame( 
        }



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

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

        if ( *pBsFormat == IVAS_DEC_BS_OBJ )
@@ -1786,7 +1786,7 @@ static ivas_error initOnFirstGoodFrame( 
        }



        /* If outputting MASA, open output file and write metadata for initial bad frames */

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

        else if ( *pBsFormat == IVAS_DEC_BS_MASA )
@@ -1798,7 +1798,7 @@ static ivas_error initOnFirstGoodFrame( 
                return error;

            }



#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

            if ( numInitialBadFrames > 0 )

            {

#endif
@@ -1822,7 +1822,7 @@ static ivas_error initOnFirstGoodFrame( 
                        return error;

                    }

                }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

            }

#endif

        }
@@ -2154,7 +2154,7 @@ static ivas_error decodeG192( 
        /* Write MASA/ISM metadata to external file(s) */

        if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )

        {

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

            if ( bsFormat == IVAS_DEC_BS_OBJ )
@@ -2183,7 +2183,7 @@ static ivas_error decodeG192( 
                    }

                }

            }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS



            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

#else
@@ -2275,7 +2275,7 @@ static ivas_error decodeG192( 
        {

            fprintf( stdout, "\nOutput metadata file:   %s\n", MasaFileWriter_getFilePath( masaWriter ) );

        }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

        else if ( bsFormat == IVAS_DEC_BS_MASA_ISM )

        {

            for ( i = 0; i < numObj; i++ )
@@ -2750,7 +2750,7 @@ static ivas_error decodeVoIP( 
            {

                int16_t i;



#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

                if ( bsFormat == IVAS_DEC_BS_OBJ )
@@ -2779,7 +2779,7 @@ static ivas_error decodeVoIP( 
                        }

                    }

                }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS



                if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

#else
@@ -3188,7 +3188,7 @@ static ivas_error decodeVariableSpeed( 
        /* Write ISm metadata to external file(s) */

        if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )

        {

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

            if ( bsFormat == IVAS_DEC_BS_OBJ )
@@ -3217,7 +3217,7 @@ static ivas_error decodeVariableSpeed( 
                    }

                }

            }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS



            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

#else
@@ -3376,7 +3376,7 @@ static ivas_error decodeVariableSpeed( 
        /* Write ISm metadata to external file(s) */

        if ( decodedGoodFrame && arg.outputFormat == IVAS_DEC_OUTPUT_EXT )

        {

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

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

#else

            if ( bsFormat == IVAS_DEC_BS_OBJ )
@@ -3405,7 +3405,7 @@ static ivas_error decodeVariableSpeed( 
                    }

                }

            }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS



            if ( bsFormat == IVAS_DEC_BS_MASA || bsFormat == IVAS_DEC_BS_MASA_ISM )

#else
@@ -3474,7 +3474,7 @@ static ivas_error decodeVariableSpeed( 
        {

            fprintf( stdout, "\nOutput metadata file:   %s\n", MasaFileWriter_getFilePath( masaWriter ) );

        }

#ifdef OMASA_EXT_OUTPUT

#ifdef MASA_AND_OBJECTS

        else if ( bsFormat == IVAS_DEC_BS_MASA_ISM )

        {

            for ( i = 0; i < numObj; i++ )

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -219,7 +219,6 @@ 
#define OMASA_BRSW_MONO_FIX                             /* Nokia: fix renderer config under rateswitching and MONO output */

#define OMASA_FIX_LOW_FS                                /* Nokia: fixes related to lower input signal sampling rates */

#define OMASA_BIT_BUFF_SZ                               /* Nokia: increase bitstream index buffer initial size */

#define OMASA_EXT_OUTPUT                                /* VA: support of EXT output configuration for OMASA DISC mode */

#define OMASA_BIT_BUFF_SZ1                              /* Nokia: increase bitstream index buffer initial size */

#define OMASA_OBJ_REND_CLOSE                            /* Nokia: close OMASA separate object renderer */

#endif

lib_dec/ivas_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -589,7 +589,7 @@ ivas_error ivas_dec( 
            ivas_omasa_dirac_rend( st_ivas, output, output_frame );

        }



#ifdef OMASA_EXT_OUTPUT

        /* external output */

        if ( st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

        {

            /* sanity check in case of bitrate switching */
@@ -609,7 +609,6 @@ ivas_error ivas_dec( 
            mvr2r( output[MAX_OUTPUT_CHANNELS - 2], output[n], output_frame );

            mvr2r( output[MAX_OUTPUT_CHANNELS - 1], output[++n], output_frame );

        }

#endif

    }

#endif

    else if ( st_ivas->ivas_format == MC_FORMAT )

lib_dec/ivas_init_dec.c

+9 −14
Original line number Diff line number Diff line
@@ -784,14 +784,11 @@ ivas_error ivas_init_decoder( 


    if ( output_config == AUDIO_CONFIG_EXTERNAL )

    {

#ifdef OMASA_EXT_OUTPUT

        if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport + st_ivas->nchan_ism;

        }

        else

#endif

            if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        else if ( !( st_ivas->ism_mode == ISM_MODE_PARAM ) )

        {

            hDecoderConfig->nchan_out = st_ivas->nchan_transport;

        }
@@ -2591,6 +2588,14 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }



    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && output_config == AUDIO_CONFIG_EXTERNAL )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for combined MASA and ISM format" );

        }

    }



#ifdef DEBUGGING

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != AUDIO_CONFIG_BINAURAL && output_config != AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

    {
@@ -2603,15 +2608,5 @@ static ivas_error doSanityChecks_IVAS( 
    }

#endif



#ifdef OMASA_EXT_OUTPUT

    if ( st_ivas->ivas_format == MASA_ISM_FORMAT )

    {

        if ( st_ivas->ism_mode != ISM_MASA_MODE_DISC && output_config == AUDIO_CONFIG_EXTERNAL )

        {

            return IVAS_ERROR( IVAS_ERR_INVALID_OUTPUT_FORMAT, "Incorrect output configuration specified for combined MASA and ISM format" );

        }

    }

#endif



    return IVAS_ERR_OK;

}

lib_dec/ivas_masa_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -571,11 +571,7 @@ ivas_error ivas_masa_decode( 
        }

    }



#ifdef OMASA_EXT_OUTPUT

    if ( ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT ) && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->hDecoderConfig->output_config == AUDIO_CONFIG_EXTERNAL )

#endif

    {

        create_masa_ext_out_meta( hMasa, hQMetaData, st_ivas->nchan_transport );

    }