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

Timestamp:

Jul 12, 2011 3:20:36 AM (13 years ago)

Author:

nanang

Message:

Misc (re#1320): added device ID in pjmedia_vid_dev_info, useful for translating default IDs to real IDs.

Location:

pjproject/branches/projects/2.0-dev/pjmedia

Files:

• include/pjmedia-videodev/videodev.h (modified) (1 diff)
• src/pjmedia-videodev/videodev.c (modified) (1 diff)

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

@@ -137 +137 @@
 typedef struct pjmedia_vid_dev_info
 {
+    /** The device ID */
+    pjmedia_vid_dev_index id;
+
     /** The device name */
     char name[64];

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia-videodev/videodev.c

@@ -571 +571 @@
         return status;
 
-    return f->op->get_dev_info(f, index, info);
+    status = f->op->get_dev_info(f, index, info);
+
+    /* Make sure device ID is the real ID (not PJMEDIA_VID_DEFAULT_*_DEV) */
+    info->id = index;
+
+    return status;
 }