Commit 9e4e3c20 authored by Lauros Pajunen's avatar Lauros Pajunen
Browse files

Align DAS and audio focus levels to match CR

parent c519ac94

lib_util/ivas_rtp_pi_data.h

+6 −6
Original line number Diff line number Diff line
@@ -305,9 +305,9 @@ typedef enum 
    IVAS_FLVL_FOCUS_LEVEL_LEVEL_10, /* Audio focus level 10  */

    IVAS_FLVL_FOCUS_LEVEL_LEVEL_11, /* Audio focus level 11  */

    IVAS_FLVL_FOCUS_LEVEL_LEVEL_12, /* Audio focus level 12  */

    IVAS_FLVL_FOCUS_LEVEL_LEVEL_13, /* Audio focus level 13  */

    IVAS_FLVL_DEFAULT_AUDIO_FOCUS,  /* Default audio focus   */

    IVAS_FLVL_MAX_AUDIO_FOCUS,      /* Apply max audio focus */

    IVAS_FLVL_DEFAULT_AUDIO_FOCUS,  /* Default audio focus   */

    IVAS_FLVL_NO_PREFERENCE,        /* No preference / No indication  */

} IVAS_FLVL;



typedef struct
@@ -335,7 +335,7 @@ typedef struct 
 */

typedef enum

{

    IVAS_SLI_NO_SUPPRESSION = 0,   /* Apply no suppression */

    IVAS_SLI_MIN_SUPPRESSION = 0,  /* Apply min suppression */

    IVAS_SLI_SUPPRESSION_LEVEL_1,  /* Suppression level 1  */

    IVAS_SLI_SUPPRESSION_LEVEL_2,  /* Suppression level 2  */

    IVAS_SLI_SUPPRESSION_LEVEL_3,  /* Suppression level 3  */
@@ -347,10 +347,10 @@ typedef enum 
    IVAS_SLI_SUPPRESSION_LEVEL_9,  /* Suppression level 9  */

    IVAS_SLI_SUPPRESSION_LEVEL_10, /* Suppression level 10 */

    IVAS_SLI_SUPPRESSION_LEVEL_11, /* Suppression level 11 */

    IVAS_SLI_SUPPRESSION_LEVEL_12, /* Suppression level 12 */

    IVAS_SLI_SUPPRESSION_LEVEL_13, /* Suppression level 13 */

    IVAS_SLI_SUPPRESSION_LEVEL_14, /* Suppression level 14 */

    IVAS_SLI_MAX_SUPPRESSION,      /* Apply max suppression */

    IVAS_SLI_NO_SUPPRESSION,       /* Apply no suppression */

    IVAS_SLI_DEFAULT_SUPPRESSION,  /* Apply default suppression */

    IVAS_SLI_NO_PREFERENCE,        /* No preference / No indication */

} IVAS_SLI;



typedef struct

tests/rtp/ivasrtp.py

+6 −6
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ class PIDATAS(str, Enum): 




class SUPPRESSION_LEVEL(int, Enum):

    SUPPRESSION_LEVEL_NONE = 0

    SUPPRESSION_LEVEL_MIN = 0

    SUPPRESSION_LEVEL_1 = 1

    SUPPRESSION_LEVEL_2 = 2

    SUPPRESSION_LEVEL_3 = 3
@@ -211,10 +211,10 @@ class SUPPRESSION_LEVEL(int, Enum): 
    SUPPRESSION_LEVEL_9 = 9

    SUPPRESSION_LEVEL_10 = 10

    SUPPRESSION_LEVEL_11 = 11

    SUPPRESSION_LEVEL_12 = 12

    SUPPRESSION_LEVEL_13 = 13

    SUPPRESSION_LEVEL_14 = 14

    SUPPRESSION_LEVEL_MAX = 15

    SUPPRESSION_LEVEL_MAX = 12

    SUPPRESSION_LEVEL_NONE = 13

    SUPPRESSION_LEVEL_DEFAULT = 14

    SUPPRESSION_LEVEL_NO_PREFERENCE = 15





class AUDIO_FOCUS_LEVEL(int, Enum):
@@ -231,7 +231,7 @@ class AUDIO_FOCUS_LEVEL(int, Enum): 
    AUDIO_FOCUS_LEVEL_10 = 10

    AUDIO_FOCUS_LEVEL_11 = 11

    AUDIO_FOCUS_LEVEL_12 = 12

    AUDIO_FOCUS_LEVEL_13 = 13

    AUDIO_FOCUS_LEVEL_MAX = 13

    AUDIO_FOCUS_LEVEL_DEFAULT = 14

    AUDIO_FOCUS_LEVEL_NO_PREFERENCE = 15