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

Fixed problem with compiling against latest OPAL. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11725 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Robert Joly 2009-02-10 03:31:03 +00:00
parent 61a6e10cfb
commit 2d1746d35a
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -965,6 +965,7 @@ switch_status_t FSConnection::write_frame(const OpalMediaType & mediaType, const
FSMediaStream::FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, unsigned sessionID, bool isSource) FSMediaStream::FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaFormat, unsigned sessionID, bool isSource)
: OpalMediaStream(conn, mediaFormat, sessionID, isSource) : OpalMediaStream(conn, mediaFormat, sessionID, isSource)
, m_fsSession(conn.GetSession()) , m_fsSession(conn.GetSession())
, m_readRTP(0, 512)
, m_callOnStart(true) , m_callOnStart(true)
{ {
memset(&m_readFrame, 0, sizeof(m_readFrame)); memset(&m_readFrame, 0, sizeof(m_readFrame));
@ -1181,8 +1182,6 @@ 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) 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)) { if (!switch_channel_ready(m_fsChannel)) {
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1210,8 +1209,8 @@ switch_status_t FSMediaStream::write_frame(const switch_frame_t *frame, switch_i
better if we could engage whatever it is in opal that makes it generate the timestamp. better if we could engage whatever it is in opal that makes it generate the timestamp.
*/ */
RTP_DataFrame rtp(frame->datalen);
rtp.SetPayloadType(mediaFormat.GetPayloadType()); rtp.SetPayloadType(mediaFormat.GetPayloadType());
rtp.SetPayloadSize(frame->datalen);
m_timeStamp += frame->samples; m_timeStamp += frame->samples;
rtp.SetTimestamp(m_timeStamp); rtp.SetTimestamp(m_timeStamp);