Commit 7886e443 authored by vaclav's avatar vaclav
Browse files

ISAR formal improvements

parent 4d5f585a

apps/decoder.c

+5 −5
Original line number Diff line number Diff line
@@ -185,10 +185,6 @@ int main( 
    uint8_t splitRendBitsBuf[ISAR_MAX_SPLIT_REND_BITS_BUFFER_SIZE_IN_BYTES];

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    splitRendBits.bits_buf = splitRendBitsBuf;

#endif



    /* Any handles that require cleanup must be declared here and initialized to NULL */

    IVAS_DEC_HANDLE hIvasDec = NULL;

    BS_READER_HANDLE hBsReader = NULL;
@@ -220,6 +216,10 @@ int main( 
    reset_mem( USE_BYTES );

#endif



#ifdef SPLIT_REND_WITH_HEAD_ROT

    splitRendBits.bits_buf = splitRendBitsBuf;

#endif



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

     * Parse command-line arguments

     *------------------------------------------------------------------------------------------*/
@@ -456,11 +456,11 @@ int main( 
        fprintf( stderr, "\nChanged render framesize, only 20ms are allowed for decoding to EXT!\n" );

    }



#ifdef SPLIT_REND_WITH_HEAD_ROT

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

     * Configure Split rendering

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



#ifdef SPLIT_REND_WITH_HEAD_ROT

    asked_frame_size = arg.renderFramesize;

    if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )

    {

apps/isar_post_rend.c

+1 −1
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ int main( 


    if ( args.inConfig.numBinBuses > 0 )

    {

        if ( ( error = IVAS_REND_SetSplitRendBitstreamHeader( hIsarPostRend, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection,

        if ( ( error = ISAR_REND_SetSplitRendBitstreamHeader( hIsarPostRend, bitsBuffer.config.codec, bitsBuffer.config.poseCorrection,

                                                              bitsBuffer.config.codec_frame_size_ms ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error in getting split renderer bitstream header: %s\n", ivas_error_to_string( error ) );

apps/renderer.c

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ static float dBToLin( 
#ifdef SPLIT_REND_WITH_HEAD_ROT

static int16_t get_cldfb_in_flag(

    const IVAS_AUDIO_CONFIG audioConfig,

    IVAS_RENDER_CONFIG_DATA *renderConfig )

    const IVAS_RENDER_CONFIG_DATA *renderConfig )

{

    int16_t cldfb_in_flag;

lib_dec/ivas_binRenderer_internal.c

+0 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ 
#include "ivas_rom_dec.h"

#include "ivas_rom_com.h"

#include "ivas_rom_binauralRenderer.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "ivas_rom_dec.h"

#include "lib_rend.h"

#endif

#ifdef DEBUGGING

#include "debug.h"

#endif

lib_dec/ivas_init_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 
#include "ivas_cnst.h"

#include "ivas_prot.h"

#include "ivas_prot_rend.h"

#include "isar_prot.h"

#include "ivas_rom_com.h"

#include "ivas_stat_enc.h"

#include "isar_stat.h"

#include "prot.h"

#ifdef SPLIT_REND_WITH_HEAD_ROT

#include "lib_isar_pre_rend.h"

#include "isar_prot.h"

#include "isar_stat.h"

#endif

#include <assert.h>

#include <math.h>