Commit d950deaf authored by bayers's avatar bayers
Browse files

fix Windows compiler warnings

parent b52f9995

apps/decoder.c

+9 −0
Original line number Diff line number Diff line
@@ -675,7 +675,9 @@ int main( 


    if ( arg.renderConfigEnabled )

    {

#ifndef API_5MS

        IVAS_RENDER_CONFIG_DATA renderConfig;

#endif



        /* sanity check */

#ifdef SPLIT_REND_WITH_HEAD_ROT
@@ -1762,6 +1764,13 @@ static ivas_error initOnFirstGoodFrame( 
            IVAS_SPLIT_REND_BITS splitRendBitsZero;

            splitRendBitsZero.bits_written = 0;

            splitRendBitsZero.bits_read = 0;

            splitRendBitsZero.bits_buf = NULL;

            splitRendBitsZero.bits_read = 0;

            splitRendBitsZero.bits_written = 0;

            splitRendBitsZero.buf_len =0;

            splitRendBitsZero.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

            splitRendBitsZero.pose_correction = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

            splitRendBitsZero.codec_frame_size_ms = 20;

            if ( split_rend_write_bitstream_to_file( *hSplitRendFileReadWrite, splitRendBitsZero.bits_buf, &splitRendBitsZero.bits_read, &splitRendBitsZero.bits_written,

                                                     -1, IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE

#ifdef API_5MS

apps/renderer.c

+5 −2
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ int main( 
    int16_t numSamplesRead;

    int16_t delayNumSamples = -1;

    int16_t delayNumSamples_orig = 0;

    int16_t zeroPad = 0;

    int32_t zeroPad = 0;

    int32_t delayTimeScale = 0;

    int16_t i, numChannels;

    ivas_error error = IVAS_ERR_OK;
@@ -1434,6 +1434,9 @@ int main( 
    bitsBuffer.config.bitsRead = 0;

    bitsBuffer.config.bitsWritten = 0;

    bitsBuffer.config.bufLenInBytes = bitsBufferSize;

    bitsBuffer.config.codec = IVAS_SPLIT_REND_CODEC_DEFAULT;

    bitsBuffer.config.poseCorrection = IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE;

    bitsBuffer.config.codec_frame_size_ms = 20;

#else

    inFloatBuffer = malloc( inBufferSize * sizeof( float ) );

    outInt16Buffer = malloc( outBufferSize * sizeof( int16_t ) );
@@ -2086,7 +2089,7 @@ int main( 
#endif

    {

#ifdef API_5MS

        int16_t zerosPadded = 0;

        int32_t zerosPadded = 0;

        zeroPad *= outBuffer.config.numChannels;

        while ( zeroPad > 0 )

        {

lib_rend/ivas_splitRendererPre.c

+3 −3
Original line number Diff line number Diff line
@@ -1877,7 +1877,7 @@ static ivas_error split_renderer_open_lc3plus( SPLIT_REND_WRAPPER *hSplitRendWra 
    error = IVAS_LC3PLUS_ENC_Open( config, ivas_get_lc3plus_bitrate( pSplitRendConfig->splitRendBitRate, pSplitRendConfig->poseCorrectionMode

#ifdef API_5MS

                                                                     ,

                                                                     config.ivas_frame_duration_us / 1000

                                                                     (int16_t) ( config.ivas_frame_duration_us / 1000 )

#endif

                                                                         ),

                                   &hSplitRendWrapper->hLc3plusEnc );
@@ -2112,7 +2112,7 @@ static ivas_error splitRendLc3plusEncodeAndWrite( 
    pBits->codec = IVAS_SPLIT_REND_CODEC_LC3PLUS;

    pBits->pose_correction = hSplitBin->multiBinPoseData.poseCorrectionMode;

#ifdef API_5MS

    pBits->codec_frame_size_ms = hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us / 1000;

    pBits->codec_frame_size_ms = (int16_t) ( hSplitBin->hLc3plusEnc->config.lc3plus_frame_duration_us / 1000 );

#endif

    return IVAS_ERR_OK;

}

lib_rend/lib_rend.c

+5 −5
Original line number Diff line number Diff line
@@ -7742,7 +7742,7 @@ static ivas_error splitBinLc3plusDecode( 
    lc3plusBitstreamSize = ivas_get_lc3plus_size_from_id( (int8_t) lc3plusBitrateId, pose_correction

#ifdef API_5MS

                                                          ,

                                                          hSplitBin->hLc3plusDec->config.ivas_frame_duration_us / 1000

                                                          (int16_t) ( hSplitBin->hLc3plusDec->config.ivas_frame_duration_us / 1000 )

#endif

    );
@@ -7885,10 +7885,10 @@ static ivas_error renderSplitBinauralWithPostRot( 
                isPostRendInputCldfb = 1;

            }



            preRendFrameSize_ms = bits.codec == IVAS_SPLIT_REND_CODEC_LC3PLUS ? hSplitBin->hLc3plusDec->config.ivas_frame_duration_us / 1000 : 20;

            preRendFrameSize_ms = bits.codec == IVAS_SPLIT_REND_CODEC_LC3PLUS ? (int16_t) ( hSplitBin->hLc3plusDec->config.ivas_frame_duration_us ) / 1000 : 20;



            outBufNumSamplesPerChannel = outAudio.config.numSamplesPerChannel;

            numSamplesPerChannelCacheSize = *splitBinInput->base.ctx.pOutSampleRate * ( preRendFrameSize_ms - bits.codec_frame_size_ms ) / 1000;

            numSamplesPerChannelCacheSize = (int16_t) ( *splitBinInput->base.ctx.pOutSampleRate * ( preRendFrameSize_ms - bits.codec_frame_size_ms ) / 1000 );



            outBufNumColPerChannel = CLDFB_NO_COL_MAX / MAX_PARAM_SPATIAL_SUBFRAMES;

            numColPerChannelCacheSize = CLDFB_NO_COL_MAX - outBufNumColPerChannel;
@@ -9568,11 +9568,11 @@ ivas_error IVAS_REND_GetSplitBinauralBitstream( 
    if ( hIvasRend->hRendererConfig->split_rend_config.codec == IVAS_SPLIT_REND_CODEC_LC3PLUS &&

         ( hIvasRend->hRendererConfig->split_rend_config.dof == 0 || hIvasRend->hRendererConfig->split_rend_config.poseCorrectionMode == IVAS_SPLIT_REND_POSE_CORRECTION_MODE_NONE ) )

    {

        hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms * ( hIvasRend->sampleRateOut / 1000 );

        hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = hIvasRend->hRendererConfig->split_rend_config.codec_frame_size_ms * (int16_t) ( hIvasRend->sampleRateOut / 1000 );

    }

    else

    {

        hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = hIvasRend->sampleRateOut / FRAMES_PER_SEC;

        hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel = (int16_t) ( hIvasRend->sampleRateOut / FRAMES_PER_SEC );

    }

    hIvasRend->splitRendEncBuffer.config.numSamplesPerChannel *= cldfb_in ? 2 : 1;