Changeset 2492 for pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia-audiodev/audiodev.h

Timestamp:

Mar 9, 2009 12:55:29 PM (15 years ago)

Author:

bennylp

Message:

PJMEDIA/PJMEDIA-AUDIODEV update:

• pjmedia.h: re-added inclusion of <sound.h> since we have compat

layer now

• audiodev.h:
  • added input_vol and output_vol in pjmedia_aud_param, and

implement it on WMME dev

• added pjmedia_aud_dev_cap_name() to see cap name
• added pjmedia_aud_param_set_cap() and pjmedia_aud_param_get_cap() to set and get specific capability in param

• conference.h: exported PJMEDIA_CONF_BRIDGE_SIGNATURE and

PJMEDIA_CONF_SWITCH_SIGNATURE since these are needed by PJSUA-LIB

• WMME: bug due to addition of input_vol and output_vol in param:

volumes are set in flags in default_param(), but the
fields are not set. This would cause audio volume to be set to
zero for example.

• WMME: some refactoring, removed duplicate settings in param
• WMME: bug: setting set in set_cap() is not saved to param, so

get_param() will return wrong setting

• APS: update because of s/out_route/output_route/ in param
• APS: same bug as WMME due to addition of input_vol and output_vol in

param: flags are set in param but the fields are not

File:

• pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia-audiodev/audiodev.h (modified) (7 diffs)

pjproject/branches/projects/aps-direct/pjmedia/include/pjmedia-audiodev/audiodev.h

@@ -65 +65 @@
     PJMEDIA_AUD_INVALID_DEV = -3
 };
-
-
-/** 
- * Type for device unique identifier. The unique device ID can be used to save
- * a reference to a particular device across software reboots.
- */
-typedef pj_uint32_t pjmedia_aud_dev_uid;
 
 
@@ -187 +180 @@
      * PJ_FALSE.
      */
-    PJMEDIA_AUD_DEV_CAP_PLC = 8192
+    PJMEDIA_AUD_DEV_CAP_PLC = 8192,
     
+    /**
+     * End of capability
+     */
+    PJMEDIA_AUD_DEV_CAP_MAX = 16384
+
 } pjmedia_aud_dev_cap;
 
@@ -370 +368 @@
     unsigned output_latency_ms;
 
+    /**
+     * Input volume setting, in percent. This setting is optional, and will 
+     * only be used if PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING is set in 
+     * the flags.
+     */
+    unsigned input_vol;
+
+    /**
+     * Output volume setting, in percent. This setting is optional, and will 
+     * only be used if PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING is set in 
+     * the flags.
+     */
+    unsigned output_vol;
+
+    /** 
+     * Set the audio input route. This setting is optional, and will only be
+     * used if PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE is set in the flags.
+     */
+    pjmedia_aud_dev_route input_route;
+
     /** 
      * Set the audio output route. This setting is optional, and will only be
      * used if PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE is set in the flags.
      */
-    pjmedia_aud_dev_route out_route;
+    pjmedia_aud_dev_route output_route;
 
     /**
@@ -411 +429 @@
 typedef struct pjmedia_aud_dev_factory pjmedia_aud_dev_factory;
 
+/**
+ * Get string info for the specified capability.
+ *
+ * @param cap           The capability ID.
+ * @param p_desc        Optional pointer which will be filled with longer 
+ *                      description about the capability.
+ *
+ * @return              Capability name.
+ */
+PJ_DECL(const char*) pjmedia_aud_dev_cap_name(pjmedia_aud_dev_cap cap,
+                                              const char **p_desc);
+
+
+/**
+ * Set a capability field value in #pjmedia_aud_param structure. This will
+ * also set the flags field for the specified capability in the structure.
+ *
+ * @param param         The structure.
+ * @param cap           The audio capability which value is to be set.
+ * @param value         Pointer to value. Please see the type of value to
+ *                      be supplied in the pjmedia_aud_dev_cap documentation.
+ *
+ * @return              PJ_SUCCESS on successful operation or the appropriate
+ *                      error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_aud_param_set_cap(pjmedia_aud_param *param,
+                                               pjmedia_aud_dev_cap cap,
+                                               const void *pval);
+
+
+/**
+ * Get a capability field value from #pjmedia_aud_param structure. This
+ * function will return PJMEDIA_EAUD_INVCAP error if the flag for that
+ * capability is not set in the flags field in the structure.
+ *
+ * @param param         The structure.
+ * @param cap           The audio capability which value is to be retrieved.
+ * @param value         Pointer to value. Please see the type of value to
+ *                      be supplied in the pjmedia_aud_dev_cap documentation.
+ *
+ * @return              PJ_SUCCESS on successful operation or the appropriate
+ *                      error code.
+ */
+PJ_DECL(pj_status_t) pjmedia_aud_param_get_cap(const pjmedia_aud_param *param,
+                                               pjmedia_aud_dev_cap cap,
+                                               void *pval);
 
 /**
@@ -444 +508 @@
  */
 PJ_DECL(pj_status_t) pjmedia_aud_subsys_shutdown(void);
-
-
-/**
- * Get string info for the specified capability.
- *
- * @param cap           The capability ID.
- * @param p_desc        Optional pointer which will be filled with longer 
- *                      description about the capability.
- *
- * @return              Capability name.
- */
-PJ_DECL(const char*) pjmedia_aud_dev_cap_name(pjmedia_aud_dev_cap cap,
-                                              const char **p_desc);
 
 
@@ -549 +600 @@
  * @param cap           The audio capability which value is to be retrieved.
  * @param value         Pointer to value to be filled in by this function 
- *                      once it returns successfully.
+ *                      once it returns successfully.  Please see the type 
+ *                      of value to be supplied in the pjmedia_aud_dev_cap
+ *                      documentation.
  *
  * @return              PJ_SUCCESS on successful operation or the appropriate
@@ -563 +616 @@
  * @param strm          The audio stream.
  * @param cap           The audio capability which value is to be set.
- * @param value         Pointer to value.
+ * @param value         Pointer to value. Please see the type of value to
+ *                      be supplied in the pjmedia_aud_dev_cap documentation.
  *
  * @return              PJ_SUCCESS on successful operation or the appropriate