Commit 06554bba authored by Jouni Paulus's avatar Jouni Paulus
Browse files

with MONO output, OMASA should not initialize hDirAC for rendering. this was... 

with MONO output, OMASA should not initialize hDirAC for rendering. this was triggered in bitrate switching. pre-compiler switch: OMASA_BRSW_MONO_FIX
parent b1074eee

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
#ifdef MASA_AND_OBJECTS

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

#define FIX_356_ISM_METADATA_SYNC_OMASA // temp. fix

#define OMASA_BRSW_MONO_FIX                             /* Nokia: fix renderer config under rateswitching and MONO output */

#endif



/* ################## End DEVELOPMENT switches ######################### */

lib_dec/ivas_masa_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -1279,7 +1279,11 @@ ivas_error ivas_masa_dec_reconfigure( 
    /* renderer might have changed, reselect */

    ivas_renderer_select( st_ivas );



#ifdef OMASA_BRSW_MONO_FIX

    if ( ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_MONO_DOWNMIX ) && st_ivas->hDirAC == NULL )

#else

    if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->hDirAC == NULL )

#endif

    {

        /* init a new DirAC dec */

        if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK )
@@ -1287,7 +1291,11 @@ ivas_error ivas_masa_dec_reconfigure( 
            return error;

        }

    }

#ifdef OMASA_BRSW_MONO_FIX

    else if ( ( st_ivas->renderer_type == RENDERER_DISABLE || st_ivas->renderer_type == RENDERER_MONO_DOWNMIX ) && st_ivas->hDirAC != NULL )

#else

    else if ( st_ivas->renderer_type == RENDERER_DISABLE && st_ivas->hDirAC != NULL )

#endif

    {

        /* close unnecessary DirAC dec */

        ivas_dirac_dec_close( &( st_ivas->hDirAC ) );