Changeset 4167 for pjproject

Timestamp:

Jun 15, 2012 8:13:43 AM (12 years ago)

Author:

ming

Message:

Fixed #1536: Modify video port creation parameter to be set with actual creation prm on output

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -677 +677 @@
  * replaced with the actual device ID upon return.
  *
- * @param param         Sound device parameters to be used for the stream.
+ * @param param         On input, it specifies the video device parameters
+ *                      to be used for the stream. On output, this will be
+ *                      set to the actual video device parameters used to
+ *                      open the stream.
  * @param cb            Pointer to structure containing video stream
  *                      callbacks.

pjproject/trunk/pjmedia/include/pjmedia/vid_port.h

@@ -79 +79 @@
 
 /**
- * Create a video port with the specified parameter.
+ * Create a video port with the specified parameter. Video port may open
+ * the video stream with different parameter than the requested values in
+ * the \a prm.vidparam argument. Application can check the the values in
+ * the \a prm.vidparam argument to see if they have changed.
  *
  * @param pool          Pool to allocate memory from.
- * @param prm           The video port parameter.
+ * @param prm           On input, it specifies the video port parameters
+ *                      to be used. On output, prm.vidparam will be set to
+ *                      the actual video device parameters used to open the
+ *                      stream.
  * @param p_vp          Pointer to receive the result.
  *
@@ -89 +95 @@
  */
 PJ_DECL(pj_status_t) pjmedia_vid_port_create(pj_pool_t *pool,
-                                             const pjmedia_vid_port_param *prm,
+                                             pjmedia_vid_port_param *prm,
                                              pjmedia_vid_port **p_vp);
 

pjproject/trunk/pjmedia/src/pjmedia/vid_port.c

@@ -185 +185 @@
 
 PJ_DEF(pj_status_t) pjmedia_vid_port_create( pj_pool_t *pool,
-                                             const pjmedia_vid_port_param *prm,
+                                             pjmedia_vid_port_param *prm,
                                              pjmedia_vid_port **p_vid_port)
 {
@@ -366 +366 @@
     }
 
+    prm->vidparam = vparam;
     *p_vid_port = vp;