convert

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12814 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/endpoints/mod_opal/mod_opal.cpp b/src/mod/endpoints/mod_opal/mod_opal.cpp
index 3191105b89ea60048a30e8c1df1dd59697e2ee14..d43fb6f6aa43a989b1e7f7b7bcf55ca743b7d008 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.cpp
+++ b/src/mod/endpoints/mod_opal/mod_opal.cpp
@@ -1057,11 +1057,9 @@ FSMediaStream::FSMediaStream(FSConnection & conn, const OpalMediaFormat & mediaF
     , m_readRTP(0, 512)\r
     , m_callOnStart(true)\r
 {\r
-\r
-    m_readFrame = (switch_frame_t *) switch_core_session_alloc(m_fsSession, sizeof(*m_readFrame));\r
-\r
-    m_readFrame->codec = m_switchCodec;\r
-    m_readFrame->flags = SFF_RAW_RTP;\r
+    memset(&m_readFrame, 0, sizeof(m_readFrame));\r
+    m_readFrame.codec = m_switchCodec;\r
+    m_readFrame.flags = SFF_RAW_RTP;\r
 }\r
 \r
 \r
@@ -1118,7 +1116,7 @@ PBoolean FSMediaStream::Open()
            << mediaFormat.GetMediaType() << " codec " << mediaFormat << " for connection " << *this);\r
 \r
     if (IsSink()) {\r
-        m_readFrame->rate = mediaFormat.GetClockRate();\r
+        m_readFrame.rate = mediaFormat.GetClockRate();\r
 \r
         if (isAudio) {\r
             switch_core_session_set_read_codec(m_fsSession, m_switchCodec);\r
@@ -1197,7 +1195,7 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
         m_callOnStart = false;\r
     }\r
 \r
-    m_readFrame->flags = 0;\r
+    m_readFrame.flags = 0;\r
 \r
     /*\r
     while (switch_channel_ready(m_fsChannel)) {\r
@@ -1224,7 +1222,7 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
                 return SWITCH_STATUS_FALSE;\r
             }\r
             if (!m_readRTP.GetPayloadSize()) {\r
-                m_readFrame->flags = SFF_CNG;\r
+                m_readFrame.flags = SFF_CNG;\r
                 break;\r
             }\r
         }\r
@@ -1236,8 +1234,8 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
     \r
         switch_core_timer_next(m_switchTimer);\r
     \r
-        if (!(m_readFrame->datalen = m_readRTP.GetPayloadSize())) {\r
-            m_readFrame->flags = SFF_CNG;\r
+        if (!(m_readFrame.datalen = m_readRTP.GetPayloadSize())) {\r
+            m_readFrame.flags = SFF_CNG;\r
         }\r
     }\r
 \r
@@ -1247,17 +1245,17 @@ switch_status_t FSMediaStream::read_frame(switch_frame_t **frame, switch_io_flag
 \r
     //switch_core_timer_step(&m_switchTimer);\r
 \r
-    m_readFrame->buflen = m_readRTP.GetSize();\r
-    m_readFrame->data = m_readRTP.GetPayloadPtr();\r
-    m_readFrame->packet = m_readRTP.GetPointer();\r
-    m_readFrame->packetlen = m_readRTP.GetHeaderSize() + m_readFrame->datalen;\r
-    m_readFrame->payload = (switch_payload_t) m_readRTP.GetPayloadType();\r
-    m_readFrame->timestamp = m_readRTP.GetTimestamp();\r
-    m_readFrame->m = (switch_bool_t) m_readRTP.GetMarker();\r
-    m_readFrame->seq = m_readRTP.GetSequenceNumber();\r
-    m_readFrame->ssrc = m_readRTP.GetSyncSource();\r
-    m_readFrame->codec = m_switchCodec;\r
-    *frame = m_readFrame;\r
+    m_readFrame.buflen = m_readRTP.GetSize();\r
+    m_readFrame.data = m_readRTP.GetPayloadPtr();\r
+    m_readFrame.packet = m_readRTP.GetPointer();\r
+    m_readFrame.packetlen = m_readRTP.GetHeaderSize() + m_readFrame.datalen;\r
+    m_readFrame.payload = (switch_payload_t) m_readRTP.GetPayloadType();\r
+    m_readFrame.timestamp = m_readRTP.GetTimestamp();\r
+    m_readFrame.m = (switch_bool_t) m_readRTP.GetMarker();\r
+    m_readFrame.seq = m_readRTP.GetSequenceNumber();\r
+    m_readFrame.ssrc = m_readRTP.GetSyncSource();\r
+    m_readFrame.codec = m_switchCodec;\r
+    *frame = &m_readFrame;\r
 \r
     return SWITCH_STATUS_SUCCESS;\r
 }\r

diff --git a/src/mod/endpoints/mod_opal/mod_opal.h b/src/mod/endpoints/mod_opal/mod_opal.h
index a282d8b7f0a083ad5a5586776041fd9fd50e0d8e..462d407469d740ee9e12b1941375e45b056743ad 100644 (file)
--- a/src/mod/endpoints/mod_opal/mod_opal.h
+++ b/src/mod/endpoints/mod_opal/mod_opal.h
@@ -234,7 +234,7 @@ class FSMediaStream:public OpalMediaStream {
     switch_channel_t *m_fsChannel;
     switch_timer_t *m_switchTimer;
     switch_codec_t *m_switchCodec;
-    switch_frame_t *m_readFrame;
+    switch_frame_t m_readFrame;
     RTP_DataFrame m_readRTP;
     bool m_callOnStart;
     uint32_t m_timeStamp;