- more cleanups
This commit is contained in:
parent
6554688cb7
commit
2a977af330
|
|
@ -141,7 +141,7 @@ void AudioStream::addData(const void* buffer, int bytes)
|
||||||
if (mMediaObserver)
|
if (mMediaObserver)
|
||||||
mMediaObserver->onMedia(buffer, bytes, MT::Stream::MediaDirection::Outgoing, this, mMediaObserverTag);
|
mMediaObserver->onMedia(buffer, bytes, MT::Stream::MediaDirection::Outgoing, this, mMediaObserverTag);
|
||||||
|
|
||||||
Codec* codec = NULL;
|
Codec* codec = nullptr;
|
||||||
{
|
{
|
||||||
Lock l(mMutex);
|
Lock l(mMutex);
|
||||||
codec = mTransmittingCodec.get();
|
codec = mTransmittingCodec.get();
|
||||||
|
|
@ -151,7 +151,7 @@ void AudioStream::addData(const void* buffer, int bytes)
|
||||||
|
|
||||||
// Resample
|
// Resample
|
||||||
unsigned dstlen = unsigned(float(codec->samplerate() / float(AUDIO_SAMPLERATE)) * bytes);
|
unsigned dstlen = unsigned(float(codec->samplerate() / float(AUDIO_SAMPLERATE)) * bytes);
|
||||||
Audio::Resampler* r = NULL;
|
Audio::Resampler* r = nullptr;
|
||||||
switch (codec->samplerate())
|
switch (codec->samplerate())
|
||||||
{
|
{
|
||||||
case 8000: r = &mCaptureResampler8; break;
|
case 8000: r = &mCaptureResampler8; break;
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ SingleAudioStream::~SingleAudioStream()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void SingleAudioStream::process(std::shared_ptr<jrtplib::RTPPacket> packet)
|
void SingleAudioStream::process(const std::shared_ptr<jrtplib::RTPPacket>& packet)
|
||||||
{
|
{
|
||||||
ICELogMedia(<< "Processing incoming RTP/RTCP packet");
|
ICELogMedia(<< "Processing incoming RTP/RTCP packet");
|
||||||
if (packet->GetPayloadType() == 101/*resip::Codec::TelephoneEvent.payloadType()*/)
|
if (packet->GetPayloadType() == 101/*resip::Codec::TelephoneEvent.payloadType()*/)
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ namespace MT
|
||||||
public:
|
public:
|
||||||
SingleAudioStream(const CodecList::Settings& codecSettings, Statistics& stat);
|
SingleAudioStream(const CodecList::Settings& codecSettings, Statistics& stat);
|
||||||
~SingleAudioStream();
|
~SingleAudioStream();
|
||||||
void process(std::shared_ptr<jrtplib::RTPPacket> packet);
|
void process(const std::shared_ptr<jrtplib::RTPPacket>& packet);
|
||||||
void copyPcmTo(Audio::DataWindow& output, int needed);
|
void copyPcmTo(Audio::DataWindow& output, int needed);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue