diff --git a/src/audio/ulaw.h b/src/audio/ulaw.h deleted file mode 100644 index c79979e857b56b3272376dc003463e7f77ffcd3a..0000000000000000000000000000000000000000 --- a/src/audio/ulaw.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2004-2005-2006 Savoir-Faire Linux inc. - * Author: Yan Morin <yan.morin@savoirfairelinux.com> - * Author: Laurielle Lea <laurielle.lea@savoirfairelinux.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef __ULAW_H__ -#define __ULAW_H__ - -#include "audiocodec.h" - -/** - * Ulaw audio codec (payload = 0) - */ -class Ulaw : public AudioCodec { -public: - // payload should be 0 - Ulaw(int payload=0); - ~Ulaw(void); - - int codecDecode(short *, unsigned char *, unsigned int); - int codecEncode(unsigned char *, short *, unsigned int); - void test(); -}; - -#endif // __ULAW_H__ diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp index a23936925f8a3175b57aded06d56b17ee332ed22..45c00017be8804353406bc2d199f06a681f28f7a 100644 --- a/src/sipvoiplink.cpp +++ b/src/sipvoiplink.cpp @@ -959,7 +959,7 @@ SIPVoIPLink::SIPStartCall(SIPCall* call, const std::string& subject) media_audio << payload << " "; rtpmap_attr << "a=rtpmap:" << payload << " " << - iter->second.data() << "/" << 8000; //iter->second->getClockRate(); + iter->second.data() << "/" << call->getCodecMap().getSampleRate(iter->first); /*nbChannel = iter->second->getChannel(); if (nbChannel!=1) {