summaryrefslogtreecommitdiff
path: root/pjmedia/include/pjmedia
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2012-04-24 13:09:14 +0000
committerBenny Prijono <bennylp@teluu.com>2012-04-24 13:09:14 +0000
commit89725b879f66d567431a9069cc6012be00c1788a (patch)
tree4ae5d29c5cccd9dc7bebccadd12afd4597fa7443 /pjmedia/include/pjmedia
parent2159a188c2108d9d3c638181c173935c7b060d26 (diff)
Re #1474: merged r4054-r4079
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4082 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/include/pjmedia')
-rw-r--r--pjmedia/include/pjmedia/echo.h7
-rw-r--r--pjmedia/include/pjmedia/sound_port.h15
2 files changed, 21 insertions, 1 deletions
diff --git a/pjmedia/include/pjmedia/echo.h b/pjmedia/include/pjmedia/echo.h
index ba7f8897..4ed62ee9 100644
--- a/pjmedia/include/pjmedia/echo.h
+++ b/pjmedia/include/pjmedia/echo.h
@@ -95,8 +95,13 @@ typedef enum pjmedia_echo_flag
* created for the echo canceller will use simple FIFO mechanism, i.e.
* without using WSOLA to expand and shrink audio samples.
*/
- PJMEDIA_ECHO_USE_SIMPLE_FIFO = 32
+ PJMEDIA_ECHO_USE_SIMPLE_FIFO = 32,
+ /**
+ * If PJMEDIA_ECHO_USE_SW_ECHO flag is specified, software echo canceller
+ * will be used instead of device EC.
+ */
+ PJMEDIA_ECHO_USE_SW_ECHO = 64
} pjmedia_echo_flag;
diff --git a/pjmedia/include/pjmedia/sound_port.h b/pjmedia/include/pjmedia/sound_port.h
index 2bc98d4d..07d15c4a 100644
--- a/pjmedia/include/pjmedia/sound_port.h
+++ b/pjmedia/include/pjmedia/sound_port.h
@@ -76,6 +76,8 @@ enum pjmedia_snd_port_option
/**
* This structure specifies the parameters to create the sound port.
+ * Use pjmedia_snd_port_param_default() to initialize this structure with
+ * default values (mostly zeroes)
*/
typedef struct pjmedia_snd_port_param
{
@@ -88,9 +90,22 @@ typedef struct pjmedia_snd_port_param
* Sound port creation options.
*/
unsigned options;
+
+ /**
+ * Echo cancellation options/flags.
+ */
+ unsigned ec_options;
+
} pjmedia_snd_port_param;
/**
+ * Initialize pjmedia_snd_port_param with default values.
+ *
+ * @param prm The parameter.
+ */
+PJ_DECL(void) pjmedia_snd_port_param_default(pjmedia_snd_port_param *prm);
+
+/**
* This opaque type describes sound device port connection.
* Sound device port is not a media port, but it is used to connect media
* port to the sound device.