kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

workaround to test a theory 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11312 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-01-20 17:22:56 +00:00
parent a0a890913a
commit ece4a74ed4
2 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/mod/endpoints/mod_opal/mod_opal.cpp
View File

@ -1212,6 +1212,8 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_io_flag_t flags)
{
RTP_DataFrame rtp;
if (!switch_channel_ready(m_fsChannel)) {
return SWITCH_STATUS_FALSE;
}
@ -1221,22 +1223,41 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_i
m_callOnStart = false;
}
if ((frame->flags & SFF_CNG)) {
return SWITCH_STATUS_SUCCESS;
}
if ((frame->flags & SFF_RAW_RTP) != 0) {
RTP_DataFrame rtp((const BYTE *) frame->packet, frame->packetlen, false);
if (GetPatch()->PushFrame(rtp))
return SWITCH_STATUS_SUCCESS;
} else if (frame->flags == 0) {
RTP_DataFrame rtp;
rtp.SetPayloadType(mediaFormat.GetPayloadType());
rtp.SetPayloadSize(frame->datalen);
rtp.SetTimestamp(frame->timestamp);
rtp.SetSyncSource(frame->ssrc);
rtp.SetMarker(frame->m);
memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen);
if (GetPatch()->PushFrame(rtp))
if (GetPatch()->PushFrame(rtp)) {
return SWITCH_STATUS_SUCCESS;
}
}
/* If we reach this code it means a call to an ivr or something else that does not generate timestamps
Its possible that frame->timestamp is set but not guarenteed and is best ignored for the time being.
We are probably relying on the rtp stack to generate the timestamp and ssrc for us at this point.
As a quick hack I am going to keep a sample counter and increment it by frame->samples but it would be
better if we could engage whatever it is in opal that makes it generate the timestamp.
*/
rtp.SetPayloadType(mediaFormat.GetPayloadType());
rtp.SetPayloadSize(frame->datalen);
m_timeStamp += frame->samples;
rtp.SetTimestamp(m_timeStamp);
//rtp.SetTimestamp(frame->timestamp);
//rtp.SetSyncSource(frame->ssrc);
//rtp.SetMarker(frame->m);
memcpy(rtp.GetPayloadPtr(), frame->data, frame->datalen);
if (GetPatch()->PushFrame(rtp)) {
return SWITCH_STATUS_SUCCESS;
}
return SWITCH_STATUS_FALSE;
}

1
src/mod/endpoints/mod_opal/mod_opal.h
View File

@ -216,6 +216,7 @@ class FSMediaStream:public OpalMediaStream {
switch_frame_t m_readFrame;
RTP_DataFrame m_readRTP;
bool m_callOnStart;
uint32_t m_timeStamp;
};