Changeset 3675

Timestamp:

Jul 22, 2011 4:49:36 AM (13 years ago)

Author:

nanang

Message:

Re #1332: Added type definition of video window handle.

Location:

pjproject/trunk

Files:

• pjmedia/include/pjmedia-videodev/videodev.h (modified) (2 diffs)
• pjmedia/src/pjmedia-videodev/sdl_dev.c (modified) (1 diff)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_vid.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia-videodev/videodev.h

@@ -45 +45 @@
  */
 typedef pj_int32_t pjmedia_vid_dev_index;
+
+/**
+ * Enumeration of window handle type.
+ */
+typedef enum pjmedia_vid_dev_hwnd_type
+{
+    /**
+     * Type none.
+     */
+    PJMEDIA_VID_DEV_HWND_TYPE_NONE,
+
+    /**
+     * Native window handle on Windows.
+     */
+    PJMEDIA_VID_DEV_HWND_TYPE_WINDOWS
+
+} pjmedia_vid_dev_hwnd_type;
+
+/**
+ * Type for window handle.
+ */
+typedef struct pjmedia_vid_dev_hwnd
+{
+    /**
+     * The window handle type.
+     */
+    pjmedia_vid_dev_hwnd_type type;
+
+    /**
+     * The window handle.
+     */
+    union
+    {
+        void        *ptr;       /**< Pointer value      */
+        int          fd;        /**< Descriptor value   */
+    } hwnd;
+
+} pjmedia_vid_dev_hwnd;
 
 /**
@@ -268 +306 @@
      * the flags.
      */
-    void *window;
+    pjmedia_vid_dev_hwnd window;
 
     /**

pjproject/trunk/pjmedia/src/pjmedia-videodev/sdl_dev.c

@@ -511 +511 @@
         if (strm->param.flags & PJMEDIA_VID_DEV_CAP_OUTPUT_WINDOW) {
             /* Use the window supplied by the application. */
-            strm->window = SDL_CreateWindowFrom(strm->param.window);
+            strm->window = SDL_CreateWindowFrom(strm->param.window.hwnd.ptr);
         } else {
             /* Create the window where we will draw. */

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -5457 +5457 @@
 {
     /**
+     * Native window handle.
+     */
+    pjmedia_vid_dev_hwnd hwnd;
+
+    /**
      * Window show status. The window is hidden if false.
      */

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_vid.c

@@ -950 +950 @@
     }
 
+    wi->hwnd = vparam.window;
     wi->show = !vparam.window_hide;
     wi->pos  = vparam.window_pos;