Commit 0b2c7a94 authored by vaclav's avatar vaclav
Browse files

Merge branch '1761_basop_PortFlpMR2051' into 'main-pc' 

Port float MR 2051 and MR 2152 to main-pc

See merge request !1818
parents ea9f30af 0f798c02

apps/decoder.c

+2 −1
Original line number Diff line number Diff line
@@ -497,7 +497,8 @@ int main( 


            if ( ( error = IVAS_DEC_SetRenderFramesize( hIvasDec, arg.renderFramesize ) ) != IVAS_ERR_OK )

            {

                return error;

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

                goto cleanup;

            }



            if ( arg.renderFramesize != asked_frame_size )

apps/isar_post_rend.c

+74 −62
Original line number Diff line number Diff line
@@ -682,19 +682,20 @@ int main( 
    int argc,

    char **argv )

{

    ISAR_POST_REND_HANDLE hIsarPostRend;

    bool mainFailed = true; /* Assume main failed until cleanup is reached without errors */

    ISAR_POST_REND_HANDLE hIsarPostRend = NULL;

    RotFileReader *headRotReader = NULL;

    RotFileReader *externalOrientationFileReader = NULL;

    SplitRendBFIFileReader *splitRendBFIReader = NULL;

    AudioFileReader *audioReader = NULL;

    AudioFileWriter *audioWriter;

    AudioFileWriter *audioWriter = NULL;

    int32_t inBufferSize;

    int32_t outBufferSize;

    int32_t bitsBufferSize;

    int16_t *inpInt16Buffer;

    Word32 *inFloatBuffer_fx;

    int16_t *outInt16Buffer;

    Word32 *outFloatBuffer_fx;

    int16_t *inpInt16Buffer = NULL;

    Word32 *inFloatBuffer_fx = NULL;

    int16_t *outInt16Buffer = NULL;

    Word32 *outFloatBuffer_fx = NULL;

    uint8_t *bitsBufferData = NULL;

    IVAS_REND_AudioBuffer inBuffer;

    IVAS_REND_AudioBuffer outBuffer;
@@ -716,6 +717,9 @@ int main( 
    reset_mem( USE_BYTES );

#endif



    inBuffer.pq_fact = NULL;

    outBuffer.pq_fact = NULL;



    hSplitRendFileReadWrite = NULL;

    bitsBuffer.bits = NULL;

    bitsBuffer.config.bitsRead = 0;
@@ -727,7 +731,6 @@ int main( 
    bitsBuffer.config.isar_frame_size_ms = 20;

    bitsBuffer.config.lc3plusHighRes = 0;





    CmdlnArgs args = parseCmdlnArgs( argc, argv );



    convert_backslash( args.inputFilePath );
@@ -738,8 +741,8 @@ int main( 
    {

        if ( RotationFileReader_open( args.headRotationFilePath, &headRotReader ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error opening file: %s\n", args.headRotationFilePath );

            exit( -1 );

            fprintf( stderr, "\nError opening file: %s\n", args.headRotationFilePath );

            goto cleanup;

        }

    }
@@ -764,14 +767,14 @@ int main( 
                                        &bitsBuffer.config.lc3plusHighRes );

        if ( error != IVAS_ERR_OK )

        {

            fprintf( stderr, "Could not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );

            exit( -1 );

            fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inMetadataFilePaths[0] );

            goto cleanup;

        }



        if ( AudioFileReader_open( &audioReader, audioFilePath ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error opening file: %s\n", audioFilePath );

            exit( -1 );

            fprintf( stderr, "\nError opening file: %s\n", audioFilePath );

            goto cleanup;

        }

    }
@@ -788,8 +791,8 @@ int main( 
                                        &bitsBuffer.config.lc3plusHighRes );

        if ( error != IVAS_ERR_OK )

        {

            fprintf( stderr, "Could not open split rend metadata file %s\n", args.inputFilePath );

            exit( -1 );

            fprintf( stderr, "\nCould not open split rend metadata file %s\n", args.inputFilePath );

            goto cleanup;

        }

        audioReader = NULL;

    }
@@ -814,20 +817,20 @@ int main( 
            /* else if sampling rate given on command line, compare with wav file */

            else if ( inFileSampleRate != args.sampleRate )

            {

                fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );

                exit( -1 );

                fprintf( stderr, "\nSampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", args.sampleRate, inFileSampleRate, args.inputFilePath );

                goto cleanup;

            }

            break;

        case IVAS_ERR_SAMPLING_RATE_UNKNOWN: /* Returned when input is raw PCM */

            if ( args.sampleRate == 0 )

            {

                fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );

                exit( -1 );

                fprintf( stderr, "\nSampling rate must be specified on command line when using raw PCM input\n" );

                goto cleanup;

            }

            break;

        default:

            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

            exit( -1 );

            fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

    }



    int16_t inFileNumChannels = 0;
@@ -836,23 +839,24 @@ int main( 
        error = AudioFileReader_getNumChannels( audioReader, &inFileNumChannels );

        if ( error != IVAS_ERR_OK && error != IVAS_ERR_NUM_CHANNELS_UNKNOWN )

        {

            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

            exit( -1 );

            fprintf( stderr, "\nAudioFileReader_getNumChannels failed: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

    }



    const int16_t frameSize_smpls = (int16_t) ( ( args.render_framesize ) * args.sampleRate * 5 / ( 1000 ) );

    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_BINAURAL;

    if ( ( error = ISAR_POST_REND_open( &hIsarPostRend, args.sampleRate, args.outConfig.audioConfig, true, 0, 0, (int16_t) args.render_framesize ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error opening renderer handle: %s\n", ivas_error_to_string( error ) );

        exit( -1 );

        fprintf( stderr, "\nError opening renderer handle: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



    /* === Configure === */

    if ( ( error = ISAR_POST_REND_InitConfig( hIsarPostRend, args.outConfig.audioConfig ) ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Error in Renderer Config Init: %s\n", ivas_error_to_string( error ) );

        exit( -1 );

        fprintf( stderr, "\nError in Renderer Config Init: %s\n", ivas_error_to_string( error ) );

        goto cleanup;

    }



    if ( args.inConfig.numBinBuses > 0 )
@@ -864,8 +868,8 @@ int main( 
                                                              bitsBuffer.config.isar_frame_size_ms,

                                                              bitsBuffer.config.lc3plusHighRes ) ) != IVAS_ERR_OK )

        {

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

            exit( -1 );

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

            goto cleanup;

        }

    }
@@ -881,8 +885,8 @@ int main( 
    {

        if ( ( error = ISAR_POST_REND_AddInput( hIsarPostRend, args.inConfig.binBuses[i].audioConfig, &splitBinIds[i] ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

            exit( -1 );

            fprintf( stderr, "\nISAR_POST_REND_AddInput failed: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }

    }
@@ -890,16 +894,16 @@ int main( 


    if ( inFileNumChannels != 0 /* inFileNumChannels is 0 with raw PCM input */ && totalNumInChannels != inFileNumChannels )

    {

        fprintf( stderr, "Number of channels in input file does not match selected configuration\n" );

        exit( -1 );

        fprintf( stderr, "\nNumber of channels in input file does not match selected configuration\n" );

        goto cleanup;

    }



    int16_t numOutChannels = 2;



    if ( AudioFileWriter_open( &audioWriter, args.outputFilePath, args.sampleRate, numOutChannels ) != IVAS_ERR_OK )

    {

        fprintf( stderr, "Failed to open file: %s\n", args.outputFilePath );

        exit( -1 );

        fprintf( stderr, "\nFailed to open file: %s\n", args.outputFilePath );

        goto cleanup;

    }



    inBufferSize = frameSize_smpls * totalNumInChannels;
@@ -977,7 +981,7 @@ int main( 
                else

                {

                    fprintf( stderr, "\nUnable to read from bitstream file!\n" );

                    exit( -1 );

                    goto cleanup;

                }

            }

        }
@@ -988,7 +992,7 @@ int main( 
            if ( ( error = AudioFileReader_read( audioReader, inpInt16Buffer, (int16_t) inBufferSize, &numSamplesRead ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nError reading from file %s\n", audioFilePath );

                exit( -1 );

                goto cleanup;

            }

        }
@@ -1014,21 +1018,21 @@ int main( 


                IF( ( error = HeadRotationFileReading( headRotReader, &headRot, &Pos ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                    fprintf( stderr, "\nError in Head Rotation File Reading: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }



                if ( ( error = ISAR_POST_REND_SetHeadRotation( hIsarPostRend, headRot, Pos, DEFAULT_AXIS, sf_idx ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error setting Head Rotation: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                    fprintf( stderr, "\nError setting Head Rotation: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }

            }

        }

        else

        {

            fprintf( stderr, "Head Rotation should be enabled in post renderer\n" );

            exit( -1 );

            fprintf( stderr, "\nHead Rotation should be enabled in post renderer\n" );

            goto cleanup;

        }



        /* Read from split renderer bfi file if specified */
@@ -1037,14 +1041,14 @@ int main( 
            int16_t bfi;

            if ( ( error = SplitRendBFIFileReading( splitRendBFIReader, &bfi ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Error in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );

                exit( -1 );

                fprintf( stderr, "\nError in SplitRendBFIFileReading(): %s\n", ivas_error_to_string( error ) );

                goto cleanup;

            }



            if ( ( error = ISAR_POST_REND_SetSplitRendBFI( hIsarPostRend, bfi ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "Error in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );

                exit( -1 );

                fprintf( stderr, "\nError in ISAR_POST_REND_SetSplitRendBFI(): %s\n", ivas_error_to_string( error ) );

                goto cleanup;

            }

        }
@@ -1054,31 +1058,32 @@ int main( 
            {

                if ( ( error = ISAR_POST_REND_GetInputNumChannels( hIsarPostRend, splitBinIds[i], &numChannels ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                    fprintf( stderr, "\nError: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }



                ISAR_POST_REND_ReadOnlyAudioBuffer tmpBuffer = getReadOnlySubBuffer( inBuffer, (int16_t) args.inConfig.binBuses[i].inputChannelIndex, numChannels );



                if ( ( error = ISAR_POST_REND_FeedInputAudio( hIsarPostRend, splitBinIds[i], tmpBuffer ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                    fprintf( stderr, "\nISAR_POST_REND_FeedInputAudio failed: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }

            }

            if ( splitBinNeedsNewFrame )

            {

                if ( ( error = ISAR_POST_REND_FeedSplitBinauralBitstream( hIsarPostRend, splitBinIds[i], &bitsBuffer ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

                    exit( -1 );

                    fprintf( stderr, "\nISAR_POST_REND_FeedSplitBinauralBitstream failed: %s\n", ivas_error_to_string( error ) );

                    goto cleanup;

                }

            }

        }



        if ( ( error = ISAR_POST_REND_GetSplitBinauralSamples( hIsarPostRend, outBuffer, &splitBinNeedsNewFrame ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );

            exit( -1 );

            fprintf( stderr, "\nISAR_POST_REND_GetSplitBinauralSamples failed: %s\n", ivas_error_to_string( error ) );

            goto cleanup;

        }



        int16_t num_out_channels;
@@ -1095,7 +1100,7 @@ int main( 
                if ( ISAR_POST_REND_GetDelay( hIsarPostRend, &delayNumSamples, &delayTimeScale ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "\nUnable to get delay of renderer!\n" );

                    exit( -1 );

                    goto cleanup;

                }



                if ( hSplitRendFileReadWrite != NULL )
@@ -1120,8 +1125,8 @@ int main( 
            {

                if ( AudioFileWriter_write( audioWriter, &outInt16Buffer[delayNumSamples * num_out_channels], outBufferSize - ( delayNumSamples * num_out_channels ) ) != IVAS_ERR_OK )

                {

                    fprintf( stderr, "Error writing audio file %s\n", args.outputFilePath );

                    exit( -1 );

                    fprintf( stderr, "\nError writing audio file %s\n", args.outputFilePath );

                    goto cleanup;

                }

                delayNumSamples = 0;

            }
@@ -1155,7 +1160,7 @@ int main( 
            if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, outBufferSize ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nOutput audio file writer error\n" );

                exit( -1 );

                goto cleanup;

            }

        }
@@ -1163,7 +1168,7 @@ int main( 
        if ( ( error = AudioFileWriter_write( audioWriter, outInt16Buffer, zeroPadToWrite * outBuffer.config.numChannels ) ) != IVAS_ERR_OK )

        {

            fprintf( stderr, "\nOutput audio file writer error\n" );

            exit( -1 );

            goto cleanup;

        }

        zeroPadToWrite = 0;

    }
@@ -1187,7 +1192,14 @@ int main( 
    }

#endif



    /* === Close === */

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

     * Close files and deallocate resources

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



    mainFailed = false; /* This will stay set to true if cleanup is reached via a goto due to an error */



cleanup:



    free( inpInt16Buffer );

    free( inFloatBuffer_fx );

    free( inBuffer.pq_fact );
@@ -1218,7 +1230,7 @@ int main( 
    print_mem( NULL );

#endif



    return 0;

    return mainFailed ? -1 : 0;

}

apps/renderer.c

+184 −176

File changed.

Preview size limit exceeded, changes collapsed.