Changeset 3516 for pjproject/branches/projects/2.0-dev

Timestamp:

Apr 10, 2011 11:54:07 PM (13 years ago)

Author:

ming

Message:

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

Location:

pjproject/branches/projects/2.0-dev

Files:

• pjlib/include/pj/errno.h (modified) (1 diff)
• pjlib/src/pj/errno.c (modified) (1 diff)
• pjmedia/include/pjmedia-videodev/errno.h (modified) (14 diffs)

pjproject/branches/projects/2.0-dev/pjlib/include/pj/errno.h

@@ -469 +469 @@
  *  - PJNATH_ERRNO_START        (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*4)
  *  - PJMEDIA_AUDIODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*5)
+ *  - PJ_SSL_ERRNO_START           (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*6)
+ *  - PJMEDIA_VIDEODEV_ERRNO_START (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*7)
  */
 

pjproject/branches/projects/2.0-dev/pjlib/src/pj/errno.c

@@ -34 +34 @@
 PJ_END_DECL
 
-#define PJLIB_MAX_ERR_MSG_HANDLER   8
+#ifndef PJLIB_MAX_ERR_MSG_HANDLER
+#       define PJLIB_MAX_ERR_MSG_HANDLER   10
+#endif
 
 /* Error message handler. */

pjproject/branches/projects/2.0-dev/pjmedia/include/pjmedia-videodev/errno.h

@@ -41 +41 @@
 /**
  * Start of error code relative to PJ_ERRNO_START_USER.
- * This value is 470000.
+ * This value is 520000.
  */
 #define PJMEDIA_VIDEODEV_ERRNO_START \
-            (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*6)
+            (PJ_ERRNO_START_USER + PJ_ERRNO_SPACE_SIZE*7)
 #define PJMEDIA_VIDEODEV_ERRNO_END   \
             (PJMEDIA_VIDEODEV_ERRNO_START + PJ_ERRNO_SPACE_SIZE - 1)
@@ -56 +56 @@
  * General/unknown error.
  */
-#define PJMEDIA_EVID_ERR        (PJMEDIA_VIDEODEV_ERRNO_START+1) /* 470001 */
+#define PJMEDIA_EVID_ERR        (PJMEDIA_VIDEODEV_ERRNO_START+1) /* 520001 */
 
 /**
@@ -62 +62 @@
  * Unknown error from video driver
  */
-#define PJMEDIA_EVID_SYSERR     (PJMEDIA_VIDEODEV_ERRNO_START+2) /* 470002 */
+#define PJMEDIA_EVID_SYSERR     (PJMEDIA_VIDEODEV_ERRNO_START+2) /* 520002 */
 
 /**
@@ -68 +68 @@
  * Video subsystem not initialized
  */
-#define PJMEDIA_EVID_INIT       (PJMEDIA_VIDEODEV_ERRNO_START+3) /* 470003 */
+#define PJMEDIA_EVID_INIT       (PJMEDIA_VIDEODEV_ERRNO_START+3) /* 520003 */
 
 /**
@@ -74 +74 @@
  * Invalid video device
  */
-#define PJMEDIA_EVID_INVDEV     (PJMEDIA_VIDEODEV_ERRNO_START+4) /* 470004 */
+#define PJMEDIA_EVID_INVDEV     (PJMEDIA_VIDEODEV_ERRNO_START+4) /* 520004 */
 
 /**
@@ -80 +80 @@
  * Found no devices
  */
-#define PJMEDIA_EVID_NODEV      (PJMEDIA_VIDEODEV_ERRNO_START+5) /* 470005 */
+#define PJMEDIA_EVID_NODEV      (PJMEDIA_VIDEODEV_ERRNO_START+5) /* 520005 */
 
 /**
@@ -86 +86 @@
  * Unable to find default device
  */
-#define PJMEDIA_EVID_NODEFDEV   (PJMEDIA_VIDEODEV_ERRNO_START+6) /* 470006 */
+#define PJMEDIA_EVID_NODEFDEV   (PJMEDIA_VIDEODEV_ERRNO_START+6) /* 520006 */
 
 /**
@@ -92 +92 @@
  * Device not ready
  */
-#define PJMEDIA_EVID_NOTREADY   (PJMEDIA_VIDEODEV_ERRNO_START+7) /* 470007 */
+#define PJMEDIA_EVID_NOTREADY   (PJMEDIA_VIDEODEV_ERRNO_START+7) /* 520007 */
 
 /**
@@ -98 +98 @@
  * The video capability is invalid or not supported
  */
-#define PJMEDIA_EVID_INVCAP     (PJMEDIA_VIDEODEV_ERRNO_START+8) /* 470008 */
+#define PJMEDIA_EVID_INVCAP     (PJMEDIA_VIDEODEV_ERRNO_START+8) /* 520008 */
 
 /**
@@ -104 +104 @@
  * The operation is invalid or not supported
  */
-#define PJMEDIA_EVID_INVOP      (PJMEDIA_VIDEODEV_ERRNO_START+9) /* 470009 */
+#define PJMEDIA_EVID_INVOP      (PJMEDIA_VIDEODEV_ERRNO_START+9) /* 520009 */
 
 /**
@@ -110 +110 @@
  * Bad or invalid video device format
  */
-#define PJMEDIA_EVID_BADFORMAT  (PJMEDIA_VIDEODEV_ERRNO_START+10) /* 4700010 */
+#define PJMEDIA_EVID_BADFORMAT  (PJMEDIA_VIDEODEV_ERRNO_START+10) /* 520010 */
 
 /**
@@ -116 +116 @@
  * Invalid video device sample format
  */
-#define PJMEDIA_EVID_SAMPFORMAT (PJMEDIA_VIDEODEV_ERRNO_START+11) /* 4700011 */
+#define PJMEDIA_EVID_SAMPFORMAT (PJMEDIA_VIDEODEV_ERRNO_START+11) /* 520011 */
 
 /**
@@ -122 +122 @@
  * Bad latency setting
  */
-#define PJMEDIA_EVID_BADLATENCY (PJMEDIA_VIDEODEV_ERRNO_START+12) /* 4700012 */
+#define PJMEDIA_EVID_BADLATENCY (PJMEDIA_VIDEODEV_ERRNO_START+12) /* 520012 */
 
 /**
@@ -128 +128 @@
  * Bad/unsupported video size
  */
-#define PJMEDIA_EVID_BADSIZE    (PJMEDIA_VIDEODEV_ERRNO_START+13) /* 4700013 */
+#define PJMEDIA_EVID_BADSIZE    (PJMEDIA_VIDEODEV_ERRNO_START+13) /* 520013 */