summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiong Sauw Ming <ming@teluu.com>2014-03-04 04:25:31 +0000
committerLiong Sauw Ming <ming@teluu.com>2014-03-04 04:25:31 +0000
commitf91fadb7c5571eabc50f56780e638bfed98a725c (patch)
treee6053a068abbd1eaef7ab2b0d6c5b1d24e763b0e
parent7b9accb4d30b959a50d5dca54d6a9c378e74a620 (diff)
Fixed #1744: Codec and audio device enumeration problem in pjsua2
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4776 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjsip/src/pjsua2/endpoint.cpp4
-rw-r--r--pjsip/src/pjsua2/media.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/pjsip/src/pjsua2/endpoint.cpp b/pjsip/src/pjsua2/endpoint.cpp
index d3ba3719..8163e997 100644
--- a/pjsip/src/pjsua2/endpoint.cpp
+++ b/pjsip/src/pjsua2/endpoint.cpp
@@ -1561,13 +1561,13 @@ AudDevManager &Endpoint::audDevManager()
const CodecInfoVector &Endpoint::codecEnum() throw(Error)
{
pjsua_codec_info pj_codec[MAX_CODEC_NUM];
- unsigned count = 0;
+ unsigned count = MAX_CODEC_NUM;
PJSUA2_CHECK_EXPR( pjsua_enum_codecs(pj_codec, &count) );
pj_enter_critical_section();
clearCodecInfoList();
- for (unsigned i=0;(i<count && i<MAX_CODEC_NUM);++i) {
+ for (unsigned i=0; i<count; ++i) {
CodecInfo *codec_info = new CodecInfo;
codec_info->fromPj(pj_codec[i]);
diff --git a/pjsip/src/pjsua2/media.cpp b/pjsip/src/pjsua2/media.cpp
index c68a4cd7..a5676399 100644
--- a/pjsip/src/pjsua2/media.cpp
+++ b/pjsip/src/pjsua2/media.cpp
@@ -470,13 +470,13 @@ void AudDevManager::setPlaybackDev(int playback_dev) const throw(Error)
const AudioDevInfoVector &AudDevManager::enumDev() throw(Error)
{
pjmedia_aud_dev_info pj_info[MAX_DEV_COUNT];
- unsigned count;
+ unsigned count = MAX_DEV_COUNT;
PJSUA2_CHECK_EXPR( pjsua_enum_aud_devs(pj_info, &count) );
pj_enter_critical_section();
clearAudioDevList();
- for (unsigned i = 0; (i<count && i<MAX_DEV_COUNT) ;++i) {
+ for (unsigned i = 0; i<count ;++i) {
AudioDevInfo *dev_info = new AudioDevInfo;
dev_info->fromPj(pj_info[i]);
audioDevList.push_back(dev_info);