Commit 74098777 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'origin/main' into... 

- Merge remote-tracking branch 'origin/main' into 2053-basop-PortMr2078-from-float-unnecessary-allocation-of-memories-for-channels-in-the-jbm-decoder
parents af60cbef 92dda2de

lib_com/ivas_error.h

+7 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ typedef enum 
    IVAS_ERR_BITSTREAM_READER_INVALID_FORMAT,

    IVAS_ERR_NO_FILE_OPEN,

    IVAS_ERR_SAMPLING_RATE_UNKNOWN,

#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK

    IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT,

#endif



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

     *    renderer (lib_rend only)            *
@@ -269,6 +272,10 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Invalid input format";

        case IVAS_ERR_INVALID_INDEX:

            return "Invalid index";

#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK

        case IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT:

            return "Euler angles were detected in the input but only Quaternions are supported";

#endif

        default:

            break;

    }

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
#define FIX_NCHAN_BUFFERS                               /* VA: issue 1322: Correct the number of float buffers (channels) at the decoder */

#define FIX_RENDERER_STACK                              /* VA: issue 1322: reduction of renderers' buffers size */

#define JBM_MEMORY_OPT                                  /* VA: issue 916: optimization of RAM in the JBM decoder */

#define FIX_1370_EXTERNAL_ORIENTATION_CHECK             /* Nokia: add sanity check for Euler angles for external orientations */





// object-editing feature porting

lib_util/rotation_file_reader.c

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,14 @@ ivas_error ExternalOrientationFileReading( 
    }



    ( externalOrientationReader->frameCounter )++;

#ifdef FIX_1370_EXTERNAL_ORIENTATION_CHECK



    /* Only Quaternion orientations are supported, raise an error if Euler angles are detected in the input */

    if ( w == -3.0f )

    {

        return IVAS_ERR_EXTERNAL_ORIENTATION_INVALID_FORMAT;

    }

#endif



    pQuaternion->w_fx = float_to_fix( w, Q29 );

    pQuaternion->x_fx = float_to_fix( x, Q29 );