Changeset 3516


Ignore:
Timestamp:
Apr 10, 2011 11:54:07 PM (9 years ago)
Author:
ming
Message:

Re #1213: Fixed error space number allocation for video devices.

Location:
pjproject/branches/projects/2.0-dev
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/projects/2.0-dev/pjlib/include/pj/errno.h

    r2992 r3516  
    469469 *  - PJNATH_ERRNO_START        (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*4) 
    470470 *  - PJMEDIA_AUDIODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*5) 
     471 *  - PJ_SSL_ERRNO_START           (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*6) 
     472 *  - PJMEDIA_VIDEODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*7) 
    471473 */ 
    472474 
  • pjproject/branches/projects/2.0-dev/pjlib/src/pj/errno.c

    r3255 r3516  
    3434PJ_END_DECL 
    3535 
    36 #define PJLIB_MAX_ERR_MSG_HANDLER   8 
     36#ifndef PJLIB_MAX_ERR_MSG_HANDLER 
     37#       define PJLIB_MAX_ERR_MSG_HANDLER   10 
     38#endif 
    3739 
    3840/* Error message handler. */ 
  • pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/errno.h

    r3392 r3516  
    4141/** 
    4242 * Start of error code relative to PJ_ERRNO_START_USER. 
    43  * This value is 470000. 
     43 * This value is 520000. 
    4444 */ 
    4545#define PJMEDIA_VIDEODEV_ERRNO_START \ 
    46             (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*6) 
     46            (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*7) 
    4747#define PJMEDIA_VIDEODEV_ERRNO_END   \ 
    4848            (PJMEDIA_VIDEODEV_ERRNO_START + PJ_ERRNO_SPACE_SIZE - 1) 
     
    5656 * General/unknown error. 
    5757 */ 
    58 #define PJMEDIA_EVID_ERR        (PJMEDIA_VIDEODEV_ERRNO_START+1) /* 470001 */ 
     58#define PJMEDIA_EVID_ERR        (PJMEDIA_VIDEODEV_ERRNO_START+1) /* 520001 */ 
    5959 
    6060/** 
     
    6262 * Unknown error from video driver 
    6363 */ 
    64 #define PJMEDIA_EVID_SYSERR     (PJMEDIA_VIDEODEV_ERRNO_START+2) /* 470002 */ 
     64#define PJMEDIA_EVID_SYSERR     (PJMEDIA_VIDEODEV_ERRNO_START+2) /* 520002 */ 
    6565 
    6666/** 
     
    6868 * Video subsystem not initialized 
    6969 */ 
    70 #define PJMEDIA_EVID_INIT       (PJMEDIA_VIDEODEV_ERRNO_START+3) /* 470003 */ 
     70#define PJMEDIA_EVID_INIT       (PJMEDIA_VIDEODEV_ERRNO_START+3) /* 520003 */ 
    7171 
    7272/** 
     
    7474 * Invalid video device 
    7575 */ 
    76 #define PJMEDIA_EVID_INVDEV     (PJMEDIA_VIDEODEV_ERRNO_START+4) /* 470004 */ 
     76#define PJMEDIA_EVID_INVDEV     (PJMEDIA_VIDEODEV_ERRNO_START+4) /* 520004 */ 
    7777 
    7878/** 
     
    8080 * Found no devices 
    8181 */ 
    82 #define PJMEDIA_EVID_NODEV      (PJMEDIA_VIDEODEV_ERRNO_START+5) /* 470005 */ 
     82#define PJMEDIA_EVID_NODEV      (PJMEDIA_VIDEODEV_ERRNO_START+5) /* 520005 */ 
    8383 
    8484/** 
     
    8686 * Unable to find default device 
    8787 */ 
    88 #define PJMEDIA_EVID_NODEFDEV   (PJMEDIA_VIDEODEV_ERRNO_START+6) /* 470006 */ 
     88#define PJMEDIA_EVID_NODEFDEV   (PJMEDIA_VIDEODEV_ERRNO_START+6) /* 520006 */ 
    8989 
    9090/** 
     
    9292 * Device not ready 
    9393 */ 
    94 #define PJMEDIA_EVID_NOTREADY   (PJMEDIA_VIDEODEV_ERRNO_START+7) /* 470007 */ 
     94#define PJMEDIA_EVID_NOTREADY   (PJMEDIA_VIDEODEV_ERRNO_START+7) /* 520007 */ 
    9595 
    9696/** 
     
    9898 * The video capability is invalid or not supported 
    9999 */ 
    100 #define PJMEDIA_EVID_INVCAP     (PJMEDIA_VIDEODEV_ERRNO_START+8) /* 470008 */ 
     100#define PJMEDIA_EVID_INVCAP     (PJMEDIA_VIDEODEV_ERRNO_START+8) /* 520008 */ 
    101101 
    102102/** 
     
    104104 * The operation is invalid or not supported 
    105105 */ 
    106 #define PJMEDIA_EVID_INVOP      (PJMEDIA_VIDEODEV_ERRNO_START+9) /* 470009 */ 
     106#define PJMEDIA_EVID_INVOP      (PJMEDIA_VIDEODEV_ERRNO_START+9) /* 520009 */ 
    107107 
    108108/** 
     
    110110 * Bad or invalid video device format 
    111111 */ 
    112 #define PJMEDIA_EVID_BADFORMAT  (PJMEDIA_VIDEODEV_ERRNO_START+10) /* 4700010 */ 
     112#define PJMEDIA_EVID_BADFORMAT  (PJMEDIA_VIDEODEV_ERRNO_START+10) /* 520010 */ 
    113113 
    114114/** 
     
    116116 * Invalid video device sample format 
    117117 */ 
    118 #define PJMEDIA_EVID_SAMPFORMAT (PJMEDIA_VIDEODEV_ERRNO_START+11) /* 4700011 */ 
     118#define PJMEDIA_EVID_SAMPFORMAT (PJMEDIA_VIDEODEV_ERRNO_START+11) /* 520011 */ 
    119119 
    120120/** 
     
    122122 * Bad latency setting 
    123123 */ 
    124 #define PJMEDIA_EVID_BADLATENCY (PJMEDIA_VIDEODEV_ERRNO_START+12) /* 4700012 */ 
     124#define PJMEDIA_EVID_BADLATENCY (PJMEDIA_VIDEODEV_ERRNO_START+12) /* 520012 */ 
    125125 
    126126/** 
     
    128128 * Bad/unsupported video size 
    129129 */ 
    130 #define PJMEDIA_EVID_BADSIZE    (PJMEDIA_VIDEODEV_ERRNO_START+13) /* 4700013 */ 
     130#define PJMEDIA_EVID_BADSIZE    (PJMEDIA_VIDEODEV_ERRNO_START+13) /* 520013 */ 
    131131 
    132132 
Note: See TracChangeset for help on using the changeset viewer.