Commit 34ce757d authored by Vladimir Malenovsky's avatar Vladimir Malenovsky
Browse files

Merge branch... 

Merge branch 'float-1550-wrong-render-frame-size-reported-when-decoding-to-split-rendering-configurations' into 'main'

Resolve "Wrong render frame size reported when decoding to split rendering configurations"

See merge request !3021
parents 0825f9d6 ba20a9b9

apps/decoder.c

+14 −0
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ int main( 
        }

    }



#ifndef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

    /*-----------------------------------------------------------------*

     * Print config information

     *-----------------------------------------------------------------*/
@@ -473,6 +474,7 @@ int main( 
        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif



    /*-------------------------------------------------------------------*

     * Load renderer configuration from file
@@ -666,6 +668,18 @@ int main( 
        hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

    }



#ifdef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

    /*-----------------------------------------------------------------*

     * Print config information

     *-----------------------------------------------------------------*/



    if ( ( error = IVAS_DEC_PrintConfig( hIvasDec, 1, arg.voipMode ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif



    /*------------------------------------------------------------------------------------------*

     * Allocate output data buffer

     *------------------------------------------------------------------------------------------*/

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ 
#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

#define FIX_BASOP_2573_RF_MODE_UPDATE                   /* FhG: BASOP issue 2573: remove duplicated update of rf_mode parameters from evs_enc_fx(); was already done in updt_enc_common_fx() */

#define FIX_2570_BUF_OVFL                               /* Orange: basop issue 2570: global-buffer-overflow in lib_rend/ivas_objectRenderer_sources_fx.c */

#define FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT        /* Dolby: float issue 1550: Wrong render framesize printout */



/* #################### End BE switches ################################## */