Commit 75c44dd8 authored by vaclav's avatar vaclav
Browse files

address reviewer's comments

parent 69348058
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ int main(

    if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
    {
        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
        fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
        goto cleanup;
    }

@@ -475,6 +475,7 @@ int main(
     * Configure Split rendering
     *------------------------------------------------------------------------------------------*/

    asked_num_subframes = arg.render_num_subframes;
    if ( arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_CODED || arg.outputConfig == IVAS_AUDIO_CONFIG_BINAURAL_SPLIT_PCM )
    {
        if ( ( error = IVAS_DEC_EnableSplitRendering( hIvasDec ) ) != IVAS_ERR_OK )
@@ -485,7 +486,7 @@ int main(

        if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg.render_num_subframes ) ) != IVAS_ERR_OK )
        {
            fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
            fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
            goto cleanup;
        }

@@ -4390,7 +4391,7 @@ static ivas_error restartDecoder(

    if ( ( error = IVAS_DEC_GetRenderNumSubfr( hIvasDec, &arg->render_num_subframes ) ) != IVAS_ERR_OK )
    {
        fprintf( stderr, "\nConfigure failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
        fprintf( stderr, "\nIVAS_DEC_GetRenderNumSubfr failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
        goto cleanup;
    }

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ typedef enum
    IVAS_ROOM_SIZE_SMALL,
    IVAS_ROOM_SIZE_MEDIUM,
    IVAS_ROOM_SIZE_LARGE

} IVAS_ROOM_SIZE_T;

typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;
+3 −3
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static ivas_error ivas_dec_reconfig_split_rend( Decoder_Struct *st_ivas );
static ivas_error ivas_dec_init_split_rend( Decoder_Struct *st_ivas );
static ivas_error ivas_create_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
static void ivas_destroy_handle_isar( ISAR_DEC_SPLIT_REND_WRAPPER_HANDLE *hSplitBinRend_out );
static int16_t get_render_frame_size_ms( IVAS_RENDER_NUM_SUBFR render_num_subfr );
static int16_t get_render_frame_size_ms( const IVAS_RENDER_NUM_SUBFR render_num_subfr );
static int16_t get_render_frame_size_samples( const DECODER_CONFIG_HANDLE hDecoderConfig );
static int16_t ivas_dec_split_rend_cldfb_in( const RENDERER_TYPE renderer_type );
static void update_voip_rendered20ms( IVAS_DEC_HANDLE hIvasDec, const int16_t nSamplesRendered );
@@ -679,7 +679,7 @@ static int16_t get_render_frame_size_samples(


/*---------------------------------------------------------------------*
 * IVAS_DEC_GetGetRenderFramesizeSamples( )
 * IVAS_DEC_etRenderFramesizeSamples( )
 *
 * Get render framesize in samples
 *---------------------------------------------------------------------*/
+2 −2
Original line number Diff line number Diff line
@@ -272,13 +272,13 @@ void ISAR_PRE_REND_GetMultiBinPoseData(
 *------------------------------------------------------------------------*/

ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(
    SPLIT_REND_WRAPPER *hSplitBin,               /* i/o: Split renderer pre-renerer handle            */
    SPLIT_REND_WRAPPER *hSplitBin,               /* i/o: Split renderer pre-renderer handle           */
    const IVAS_QUATERNION headPosition,          /* i  : head rotation QUATERNION                     */
    const int32_t SplitRendBitRate,              /* i  : Split renderer bitrate                       */
    ISAR_SPLIT_REND_CODEC splitCodec,            /* i/o: Split renderer codec                         */
    const int16_t isar_frame_size_ms,            /* i  : ISAR framesize                               */
    int16_t codec_frame_size_ms,                 /* i/o: ISAR transport codec framesize               */
    ISAR_SPLIT_REND_BITS_HANDLE pBits,           /* i/o: ISAR bits struct handle                      */
    ISAR_SPLIT_REND_BITS_HANDLE pBits,           /* i/o: ISAR bits handle                             */
    float *Cldfb_In_BinReal[][CLDFB_NO_COL_MAX], /* i/o: CLDFB real buffer                            */
    float *Cldfb_In_BinImag[][CLDFB_NO_COL_MAX], /* i/o: CLDFB imag buffer                            */
    const int16_t max_bands,                     /* i  : CLDFB bands                                  */
+6 −6
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@
 *----------------------------------------------------------------------------------*/

ivas_error ISAR_PRE_REND_open(
    SPLIT_REND_WRAPPER *hSplitBinRend,                                  /* i/o: Split renderer pre-renerer handle               */
    ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,                      /* i/o: Split renderer pre-renerer config               */
    SPLIT_REND_WRAPPER *hSplitBinRend,                                  /* i/o: Split renderer pre-renderer handle              */
    ISAR_SPLIT_REND_CONFIG_DATA *pSplitRendConfig,                      /* i/o: Split renderer pre-renderer config              */
    const int32_t output_Fs,                                            /* i  : output sampling rate                            */
    const int16_t cldfb_in_flag,                                        /* i  : Flag to indicate CLDFB or time doamin input     */
    const int16_t pcm_out_flag,                                         /* i  : Flag to indicate PCM output                     */
@@ -64,13 +64,13 @@ void ISAR_PRE_REND_GetMultiBinPoseData(
);

ivas_error ISAR_PRE_REND_MultiBinToSplitBinaural(
    SPLIT_REND_WRAPPER *hSplitBin,                                     /* i/o: Split renderer pre-renerer handle                */
    SPLIT_REND_WRAPPER *hSplitBin,                                     /* i/o: Split renderer pre-rendrer handle                */
    const IVAS_QUATERNION headPosition,                                /* i  : head rotation QUATERNION                         */
    const int32_t SplitRendBitRate,                                    /* i  : Split renderer bitrate                           */
    ISAR_SPLIT_REND_CODEC splitCodec,                                  /* i/o: Split renderer codec                             */
    const int16_t isar_frame_size_ms,                                  /* i  : ISAR framesize                                   */
    int16_t codec_frame_size_ms,                                       /* i/o: ISAR transport codec framesize                   */
    ISAR_SPLIT_REND_BITS_HANDLE pBits,                                 /* i/o: ISAR bits struct handle                          */
    ISAR_SPLIT_REND_BITS_HANDLE pBits,                                 /* i/o: ISAR bits handle                                 */
    float* Cldfb_In_BinReal[][CLDFB_NO_COL_MAX],                       /* i/o: CLDFB real buffer                                */
    float* Cldfb_In_BinImag[][CLDFB_NO_COL_MAX],                       /* i/o: CLDFB imag buffer                                */
    const int16_t max_bands,                                           /* i  : CLDFB bands                                      */