Commit d128bc21 authored by vaclav's avatar vaclav
Browse files

fix merging issues

parent 812aab62

lib_dec/lib_dec.c

+6 −12
Original line number Diff line number Diff line
@@ -697,15 +697,15 @@ ivas_error IVAS_DEC_GetRenderFramesizeSamples( 


ivas_error IVAS_DEC_GetRenderFramesizeMs(

    IVAS_DEC_HANDLE hIvasDec,     /* i/o: IVAS decoder handle          */

    uint32_t *systemTime      /* o  : render framesize in ms       */

    uint32_t *render_framesize_ms /* o  : render framesize in ms       */

)

{

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || systemTime == NULL )

    if ( hIvasDec == NULL || hIvasDec->st_ivas == NULL || render_framesize_ms == NULL )

    {

        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



    *systemTime = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );

    *render_framesize_ms = get_render_frame_size_ms( hIvasDec->st_ivas->hDecoderConfig->render_num_subframes );



    return IVAS_ERR_OK;

}
@@ -5672,24 +5672,18 @@ static ivas_error feedSinglePIorientation( 
    if ( !st_ivas->hExtOrientationData )

    {

        if ( ( error = ivas_external_orientation_open( &( st_ivas->hExtOrientationData ), st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )

        {

            if ( ( error = ivas_external_orientation_open( &( hIvasDec->st_ivas->hExtOrientationData ), hIvasDec->st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

    }



    if ( !st_ivas->hCombinedOrientationData )

    {

        if ( ( error = ivas_combined_orientation_open( &( st_ivas->hCombinedOrientationData ), st_ivas->hDecoderConfig->output_Fs, st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )

        {

            if ( ( error = ivas_combined_orientation_open( &( hIvasDec->st_ivas->hCombinedOrientationData ), hIvasDec->st_ivas->hDecoderConfig->output_Fs, hIvasDec->st_ivas->hDecoderConfig->render_num_subframes ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }

    }



    QuaternionInverse( *orientation, &invOrientation );

lib_dec/lib_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ ivas_error IVAS_DEC_GetNumOrientationSubframes( 
#endif

ivas_error IVAS_DEC_GetRenderFramesizeMs(

    IVAS_DEC_HANDLE hIvasDec,                   /* i/o: IVAS decoder handle                                                     */

    uint32_t *render_framesize                  /* o  : render framesize in samples                                             */

    uint32_t *render_framesize_ms               /* o  : render framesize in ms                                                  */

);



#ifdef DEBUGGING