Commit f93b8d51 authored by vaclav's avatar vaclav
Browse files

replace numbers by macros

parent 53cf1b85

apps/decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int main( 
        }

        /* ISAR frame size is set from command line, not renderer config file.

         * This will be ignored if output format is not split rendering. */

        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes */ * 5;

        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) arg.renderFramesize /* given in number of 5ms subframes */ * BINAURAL_RENDERING_FRAME_SIZE_MS;



        if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )

        {
@@ -1761,7 +1761,7 @@ static ivas_error initOnFirstGoodFrame( 
            splitRendBitsZero.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

            splitRendBitsZero.pose_correction = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

            splitRendBitsZero.codec_frame_size_ms = 0;

            splitRendBitsZero.isar_frame_size_ms = 20;

            splitRendBitsZero.isar_frame_size_ms = 1000 / IVAS_NUM_FRAMES_PER_SEC;



            if ( split_rend_write_bitstream_to_file( *splitRendWriter, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written ) != IVAS_ERR_OK )

            {

apps/isar_post_rend.c

+2 −2
Original line number Diff line number Diff line
@@ -727,8 +727,8 @@ int main( 
    bitsBuffer.config.bufLenInBytes = 0;

    bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

    bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    bitsBuffer.config.codec_frame_size_ms = 5;

    bitsBuffer.config.isar_frame_size_ms = 20;

    bitsBuffer.config.codec_frame_size_ms = BINAURAL_RENDERING_FRAME_SIZE_MS;

    bitsBuffer.config.isar_frame_size_ms = 1000 / IVAS_NUM_FRAMES_PER_SEC;

    bitsBuffer.config.lc3plusHighRes = 0;



    CmdlnArgs args = parseCmdlnArgs( argc, argv );

apps/renderer.c

+3 −3
Original line number Diff line number Diff line
@@ -813,8 +813,8 @@ int main( 
    bitsBuffer.config.bufLenInBytes = 0;

    bitsBuffer.config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

    bitsBuffer.config.poseCorrection = ISAR_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    bitsBuffer.config.codec_frame_size_ms = 5;

    bitsBuffer.config.isar_frame_size_ms = 20;

    bitsBuffer.config.codec_frame_size_ms = BINAURAL_RENDERING_FRAME_SIZE_MS;

    bitsBuffer.config.isar_frame_size_ms = 1000 / IVAS_NUM_FRAMES_PER_SEC;

    bitsBuffer.config.lc3plus_highres = 0;

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

    {
@@ -1195,7 +1195,7 @@ int main( 


        /* ISAR frame size is set from command line, not renderer config file.

         * This will be ignored if output format is not split rendering. */

        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) args.render_framesize /* given in number of 5ms subframes */ * 5;

        renderConfig.split_rend_config.isar_frame_size_ms = (int16_t) args.render_framesize /* given in number of 5ms subframes */ * BINAURAL_RENDERING_FRAME_SIZE_MS;



        if ( ( error = IVAS_REND_FeedRenderConfig( hIvasRend, renderConfig ) ) != IVAS_ERR_OK )

        {

lib_dec/lib_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -2708,7 +2708,7 @@ static ivas_error copyRendererConfigStruct( 
    hRCout->split_rend_config.dof = 3;

    hRCout->split_rend_config.hq_mode = 0;

    hRCout->split_rend_config.codec_delay_ms = 0;

    hRCout->split_rend_config.isar_frame_size_ms = 20;

    hRCout->split_rend_config.isar_frame_size_ms = 1000 / IVAS_NUM_FRAMES_PER_SEC;

    move16();

    hRCout->split_rend_config.codec_frame_size_ms = 0; /* 0 means "use default for selected codec" */

    hRCout->split_rend_config.codec = ISAR_SPLIT_REND_CODEC_DEFAULT;

lib_rend/ivas_render_config_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ ivas_error ivas_render_config_init_from_rom_fx( 
    move16();

    ( *hRenderConfig )->split_rend_config.codec_delay_ms = 0;

    move16();

    ( *hRenderConfig )->split_rend_config.isar_frame_size_ms = 20;

    ( *hRenderConfig )->split_rend_config.isar_frame_size_ms = 1000 / IVAS_NUM_FRAMES_PER_SEC;

    move16();

    ( *hRenderConfig )->split_rend_config.codec_frame_size_ms = 0; /* 0 means "use default for selected codec" */

    move16();