cdd782c4ce
Add Boost and unit test framework. Fix crude soundSampleQueue. Disable link SIP->Mumble for a while.
86 satır
2.8 KiB
C++
86 satır
2.8 KiB
C++
#include "PjsuaMediaPort.hpp"
|
|
|
|
using namespace std;
|
|
using namespace pjsua;
|
|
|
|
|
|
pj_status_t pjsua::MediaPort_getFrame(pjmedia_port *port,
|
|
pjmedia_frame *frame) {
|
|
PjsuaMediaPort *mediaPort = static_cast<PjsuaMediaPort *>(port->port_data.pdata);
|
|
pj_int16_t *samples = static_cast<pj_int16_t *>(frame->buf);
|
|
pj_size_t count = frame->size / 2 / PJMEDIA_PIA_CCNT(&port->info);
|
|
|
|
int takenSamples = mediaPort->inputQueue.pop_front(samples, count);
|
|
|
|
mediaPort->fileHandle.write(samples, takenSamples);
|
|
|
|
mediaPort->logger.debug("Pop %d samples from inputQueue.", takenSamples);
|
|
|
|
for (int i = takenSamples; i < count; ++i) {
|
|
samples[i] = 0;
|
|
}
|
|
|
|
// todo wrzucić sample do wav
|
|
|
|
frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
|
|
|
|
return PJ_SUCCESS;
|
|
}
|
|
|
|
pj_status_t pjsua::MediaPort_putFrame(pjmedia_port *port,
|
|
pjmedia_frame *frame) {
|
|
PjsuaMediaPort *mediaPort = static_cast<PjsuaMediaPort *>(port->port_data.pdata);
|
|
pj_int16_t *samples = static_cast<pj_int16_t *>(frame->buf);
|
|
pj_size_t count = frame->size / 2 / PJMEDIA_PIA_CCNT(&port->info);
|
|
|
|
// if (count > 0) {
|
|
// mediaPort->outputQueue.push_back(samples, count);
|
|
//
|
|
// mediaPort->logger.debug("Push %d samples into outputQueue.", count);
|
|
// }
|
|
|
|
return PJ_SUCCESS;
|
|
}
|
|
|
|
PjsuaMediaPort::PjsuaMediaPort(
|
|
SoundSampleQueue<SOUND_SAMPLE_TYPE> &inputQueue,
|
|
SoundSampleQueue<SOUND_SAMPLE_TYPE> &outputQueue)
|
|
: inputQueue(inputQueue),
|
|
outputQueue(outputQueue),
|
|
_pjmedia_port(nullptr),
|
|
logger(log4cpp::Category::getInstance("PjsuaMediaPort")) {
|
|
|
|
fileHandle = SndfileHandle("capture_pjsua.wav", SFM_WRITE, SF_FORMAT_WAV | SF_FORMAT_PCM_16, 1, SAMPLING_RATE);
|
|
}
|
|
|
|
pjmedia_port *pjsua::PjsuaMediaPort::create_pjmedia_port() {
|
|
|
|
_pjmedia_port = new pjmedia_port();
|
|
|
|
pj_str_t name = toPjString("PjsuaMediaPort");
|
|
|
|
pj_status_t status = pjmedia_port_info_init(&(_pjmedia_port->info),
|
|
&name,
|
|
PJMEDIA_SIG_CLASS_PORT_AUD('s', 'i'),
|
|
SAMPLING_RATE,
|
|
1,
|
|
16,
|
|
SAMPLING_RATE * 20 / 1000); // todo recalculate to match mumble specs
|
|
|
|
if (status != PJ_SUCCESS) {
|
|
throw pjsua::Exception("Error while calling pjmedia_port_info_init().", status);
|
|
}
|
|
|
|
_pjmedia_port->get_frame = &MediaPort_getFrame;
|
|
_pjmedia_port->put_frame = &MediaPort_putFrame;
|
|
|
|
_pjmedia_port->port_data.pdata = this;
|
|
|
|
return _pjmedia_port;
|
|
}
|
|
|
|
pjsua::PjsuaMediaPort::~PjsuaMediaPort() {
|
|
if (this->_pjmedia_port != nullptr) {
|
|
delete _pjmedia_port;
|
|
}
|
|
} |