diff --git a/src/audio/codecs/Makefile.am b/src/audio/codecs/Makefile.am index 80e466d14389feb6623ae66ca00a10051c123725..e68e5257dae512a97f2ceb8c6cb9531557404f2c 100644 --- a/src/audio/codecs/Makefile.am +++ b/src/audio/codecs/Makefile.am @@ -33,8 +33,8 @@ libcodec_ilbc_so_LDFLAGS = -shared ilbc/*.o -lc SUBDIRS = ilbc -install-exec-local: install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_RULE) install-libcodec_ilbc_so -uninstall-local: uninstall-libcodec_ulaw_so uninstall-libcodec_alaw_so uninstall-libcodec_gsm_so uninstall-libcodec_speex_so uninstall-libcodec_ilbc_so +install-exec-local: install-libcodec_ulaw_so install-libcodec_alaw_so $(INSTALL_GSM_RULE) $(INSTALL_SPEEX_RULE) +uninstall-local: uninstall-libcodec_ulaw_so uninstall-libcodec_alaw_so uninstall-libcodec_gsm_so uninstall-libcodec_speex_so install-libcodec_ulaw_so: libcodec_ulaw.so mkdir -p $(sflcodecdir) @@ -45,8 +45,8 @@ install-libcodec_gsm_so: libcodec_gsm.so $(INSTALL_PROGRAM) libcodec_gsm.so $(sflcodecdir) install-libcodec_speex_so: libcodec_speex.so $(INSTALL_PROGRAM) libcodec_speex.so $(sflcodecdir) -install-libcodec_ilbc_so: libcodec_ilbc.so - $(INSTALL_PROGRAM) libcodec_ilbc.so $(sflcodecdir) +#install-libcodec_ilbc_so: libcodec_ilbc.so +# $(INSTALL_PROGRAM) libcodec_ilbc.so $(sflcodecdir) uninstall-libcodec_ulaw_so: @@ -57,7 +57,7 @@ uninstall-libcodec_gsm_so: rm -f $(sflcodecdir)/libcodec_gsm.so uninstall-libcodec_speex_so: rm -f $(sflcodecdir)/libcodec_speex.so -uninstall-libcodec_ilbc_so: - rm -f $(sflcodecdir)/libcodec_ilbc.so rm -rf $(sflcodecdir) +#uninstall-libcodec_ilbc_so: +# rm -f $(sflcodecdir)/libcodec_ilbc.so diff --git a/src/audio/codecs/alaw.cpp b/src/audio/codecs/alaw.cpp index 933a698bb71694504a1596ced7caa1d2d24428e7..d8b69d03593318a9f368eb63762ebf1f86373d24 100644 --- a/src/audio/codecs/alaw.cpp +++ b/src/audio/codecs/alaw.cpp @@ -29,6 +29,8 @@ public: { _clockRate = 8000; _channel = 1; + _bitrate = 64; + _bandwidth = 80; } virtual ~Alaw(){} diff --git a/src/audio/codecs/audiocodec.h b/src/audio/codecs/audiocodec.h index a72c61f8e2d242e0c05e3d0756d123c61ba1901f..5604efe64ff94d204e8f159eeec43178a66aa7cb 100644 --- a/src/audio/codecs/audiocodec.h +++ b/src/audio/codecs/audiocodec.h @@ -16,12 +16,13 @@ protected: /** Number of channel 1 = mono, 2 = stereo */ unsigned int _channel; + double _bitrate; + double _bandwidth; + private: int _payload; bool _hasDynamicPayload; bool _state; - double _bitrate; - double _bandwidth; public: AudioCodec(int payload, const std::string &codecName) diff --git a/src/audio/codecs/gsmcodec.cpp b/src/audio/codecs/gsmcodec.cpp index 40b3d1bf5035e93dde514975c054fdd8c28d40fb..cf0f3bdf1448e3e630578082b995645f05c9b572 100644 --- a/src/audio/codecs/gsmcodec.cpp +++ b/src/audio/codecs/gsmcodec.cpp @@ -33,6 +33,8 @@ public: Gsm (int payload=3): AudioCodec(payload, "GSM"){ _clockRate = 8000; _channel = 1; + _bitrate = 13.3; + _bandwidth = 29.2; if (!(_decode_gsmhandle = gsm_create() )) printf("ERROR: decode_gsm_create\n"); diff --git a/src/audio/codecs/ilbc.cpp b/src/audio/codecs/ilbc.cpp index de88d7430bd3c91a9233b3374fda013405514d8c..3c56b599f03e90000db589814d7bba43fce600ec 100644 --- a/src/audio/codecs/ilbc.cpp +++ b/src/audio/codecs/ilbc.cpp @@ -12,6 +12,8 @@ public: : AudioCodec(payload, "iLBC"){ _clockRate = 8000; _channel = 1; + _bitrate = 13.3; + _bandwidth = 31.3; initILBC(); diff --git a/src/audio/codecs/speexcodec.cpp b/src/audio/codecs/speexcodec.cpp index 9922ce7ac0fa51850241dcaed218b4735535ddf2..720a66dfe9964bb58c4bcc0e5de8415a15752883 100644 --- a/src/audio/codecs/speexcodec.cpp +++ b/src/audio/codecs/speexcodec.cpp @@ -29,6 +29,8 @@ public: { _clockRate = 8000; _channel = 1; + _bitrate = 0; + _bandwidth = 0; initSpeex(); } diff --git a/src/audio/codecs/ulaw.cpp b/src/audio/codecs/ulaw.cpp index f4a3e89c5a2e82648d4a0e88768563bb428497c4..2a53c81a04b8587c12a2499f7fa77f761882691c 100644 --- a/src/audio/codecs/ulaw.cpp +++ b/src/audio/codecs/ulaw.cpp @@ -31,6 +31,8 @@ public: { _clockRate = 8000; _channel = 1; + _bitrate = 64; + _bandwidth = 80; } virtual int codecDecode (short *dst, unsigned char *src, unsigned int size) {