提交 2d1746d3 authored 作者: Robert Joly's avatar Robert Joly

Fixed problem with compiling against latest OPAL.

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11725 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 61a6e10c
...@@ -965,6 +965,7 @@ switch_status_t FSConnection::write_frame(const OpalMediaType & mediaType, const ...@@ -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 ...@@ -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 ...@@ -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);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论