Commit a7578e0f authored by emerit's avatar emerit
Browse files

Merge branch 'main' into... 

Merge branch 'main' into Float-1134-BRIR-Level-differences-between-MC-rendering-to-stereo-and-binaural
parents 326119d9 9e96b65f

Workspace_msvc/lib_dec.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ 
    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_jmf.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c" />

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_window.c" />

    <ClCompile Include="..\lib_dec\LD_music_post_filter.c" />
@@ -318,7 +317,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4_inputbuffer.h" />

    <ClInclude Include="..\lib_dec\jbm_jb4_jmf.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_similarityestimation.h" />

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_window.h" />

    <ClInclude Include="..\lib_dec\lib_dec.h" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −6
Original line number Diff line number Diff line
@@ -415,9 +415,6 @@ 
    <ClCompile Include="..\lib_dec\jbm_pcmdsp_apa.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_fifo.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\jbm_pcmdsp_similarityestimation.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -532,9 +529,6 @@ 
    <ClInclude Include="..\lib_dec\jbm_jb4sb.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_fifo.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

    <ClInclude Include="..\lib_dec\jbm_pcmdsp_apa.h">

      <Filter>decoder_h</Filter>

    </ClInclude>

apps/decoder.c

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

    }



#ifndef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

#ifdef DEBUGGING

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

     * Preview bitstream and print config information
@@ -587,6 +588,7 @@ int main( 
        fprintf( stderr, "\nIVAS_DEC_PrintConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

        goto cleanup;

    }

#endif

#endif



    /*-------------------------------------------------------------------*
@@ -777,6 +779,99 @@ int main( 
        hHrtfBinary.hrtf_set_audio_cfg = IVAS_AUDIO_CONFIG_INVALID;

    }



#ifdef FIX_1550_WRONG_RENDER_FRAMESIZE_PRINTOUT

#ifdef DEBUGGING

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

     * Preview bitstream and print config information

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



    if ( arg.voipMode )

    {

        if ( ( error = printBitstreamInfoVoip( arg, hBsReader, hIvasDec ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error while previewing VoIP bitstream: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

    }

    else

    {

        uint16_t bit_stream[IVAS_MAX_BITS_PER_FRAME + 4 * 8];

        int16_t num_bits;

        int16_t bfi = 0;

        do

        {

            if ( BS_Reader_ReadFrame_short( hBsReader, bit_stream, &num_bits, &bfi ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError: input bitstream file %s couldn't be read\n\n", arg.inputBitstreamFilename );

                goto cleanup;

            }

        } while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_5K2 );



        BS_Reader_Rewind( hBsReader );



        IVAS_DEC_PrintConfigWithBitstream( hIvasDec, arg.quietModeEnabled, bit_stream, num_bits );



#ifdef VARIABLE_SPEED_DECODING

        if ( arg.tsmEnabled )

        {

            if ( arg.tsmScaleFileEnabled )

            {

                fprintf( stdout, "Variable speed file:    %s\n", arg.tsmScaleFileName );

            }

            else

            {

                fprintf( stdout, "Variable speed factor:  %i\n", arg.tsmScale );

            }

        }

#endif

    }



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

     * Open Error pattern file for simulation

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



    if ( arg.FEPatternFileName != NULL )

    {

        if ( ( FEC_pattern = fopen( arg.FEPatternFileName, "rb" ) ) == NULL )

        {

            fprintf( stderr, "Error: Missing or incorrect FEC filename specification\n\n" );

            usage_dec();

            goto cleanup;

        }

    }



#ifdef DEBUG_SBA_AUDIO_DUMP

    ivas_open_sba_decoder_debug_files( arg.output_Fs, 1, 1 );

#endif



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

     * Print information about FEC

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



    if ( !arg.voipMode && ( arg.FEPatternFileName != NULL || arg.FER > 0 ) )

    {

        if ( arg.FEPatternFileName != NULL )

        {

            fprintf( stdout, "FEC:                    %s\n", arg.FEPatternFileName );

        }

        else

        {

            fprintf( stdout, "FEC:                    %.2f %%\n", arg.FER );

        }

    }

#else

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

     * 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

#endif



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

     * Allocate output data buffer

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

lib_com/ivas_prot.h

+2 −0
Original line number Diff line number Diff line
@@ -2950,7 +2950,9 @@ ivas_error stereo_memory_enc( 
    CPE_ENC_HANDLE hCPE,                                        /* i  : CPE encoder structure                   */

    const int32_t input_Fs,                                     /* i  : input sampling rate                     */

    const int16_t max_bwidth,                                   /* i  : maximum audio bandwidth                 */

#ifndef FIX_1594_TDM_LAST_RATIO

    float *tdm_last_ratio,                                      /* o  : TD stereo last ratio                    */

#endif

    const IVAS_FORMAT ivas_format,                              /* i  : IVAS format                             */

    const int16_t nchan_transport                               /* i  : number transport chans                  */

);

lib_com/options.h

+4 −1
Original line number Diff line number Diff line
@@ -164,7 +164,10 @@ 
#define FIX_FLOAT_1539_G192_FORMAT_SWITCH               /* Nokia: reintroduce format switching for g192 bitstreams */

#define FIX_2095_REMOVE_UNUSED_ISAR_TABLES              /* Dolby: remove unused ISAR */

#define FIX_FLOAT_1582_STEREO_DFT_QUANTIZE_ITD          /* FhG: float issue 1582: Remove unncessary statement from stereo_dft_quantize_itd() */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA: float issue 1585: alternative fix memory leaks with format switching */

#define FIX_1585_ASAN_FORMAT_SW_ALT                     /* VA,FhG: float issues 1585,1593: alternative fix memory leaks with format switching */

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

#define FIX_1594_TDM_LAST_RATIO                         /* VA: float issue 1594: remove obsolete argument 'tdm_last_ratio' from stereo_memory_enc () */

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



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