Re #1790: Use OpenGL textures instead of platform dependent textures.

This revision contains:
 * remove the generation of iOS texture (instead directly use OpenGL textures)
 * add iOS and Android window type



git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4925 74dad513-b988-da41-8d7b-12977e46ad98

2 files changed, 17 insertions, 5 deletions

diff --git a/pjmedia/include/pjmedia-videodev/opengl_dev.h b/pjmedia/include/pjmedia-videodev/opengl_dev.h
index 750df8e5..3763b2f0 100644
--- a/pjmedia/include/pjmedia-videodev/opengl_dev.h
+++ b/pjmedia/include/pjmedia-videodev/opengl_dev.h
@@ -40,14 +40,13 @@ pjmedia_vid_dev_opengl_imp_create_stream(pj_pool_t *pool,
 typedef struct gl_buffers gl_buffers;
 
 /* Create OpenGL buffers. */
-void        pjmedia_vid_dev_opengl_create_buffers(pj_pool_t *pool,
+void        pjmedia_vid_dev_opengl_create_buffers(pj_pool_t *pool, pj_bool_t direct,
                                                   gl_buffers **glb);
 /* Initialize OpenGL buffers. */
 pj_status_t pjmedia_vid_dev_opengl_init_buffers(gl_buffers *glb);
 /* Render a texture. */
-pj_status_t pjmedia_vid_dev_opengl_draw(gl_buffers *glb,
-                                        unsigned int texture,
-                                        unsigned int name);
+pj_status_t pjmedia_vid_dev_opengl_draw(gl_buffers *glb,unsigned int width,
+                                        unsigned int height, void *pixels);
 /* Destroy OpenGL buffers. */
 void        pjmedia_vid_dev_opengl_destroy_buffers(gl_buffers *glb);
 
diff --git a/pjmedia/include/pjmedia-videodev/videodev.h b/pjmedia/include/pjmedia-videodev/videodev.h
index d7def15b..0bcb1686 100644
--- a/pjmedia/include/pjmedia-videodev/videodev.h
+++ b/pjmedia/include/pjmedia-videodev/videodev.h
@@ -58,7 +58,17 @@ typedef enum pjmedia_vid_dev_hwnd_type
     /**
      * Native window handle on Windows.
      */
-    PJMEDIA_VID_DEV_HWND_TYPE_WINDOWS
+    PJMEDIA_VID_DEV_HWND_TYPE_WINDOWS,
+
+    /**
+     * Native view on iOS.
+     */
+    PJMEDIA_VID_DEV_HWND_TYPE_IOS,
+
+    /**
+     * Native window handle on Android.
+     */
+    PJMEDIA_VID_DEV_HWND_TYPE_ANDROID
 
 } pjmedia_vid_dev_hwnd_type;
 
@@ -90,6 +100,9 @@ typedef struct pjmedia_vid_dev_hwnd
 	struct {
 	    void    *window;    /**< Window	*/
 	} ios;
+	struct {
+	    void    *window;    /**< Native window */
+	} android;
 	void 	    *window;
     } info;