video stuff windows build.

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

diff --git a/Freeswitch.sln b/Freeswitch.sln
index dcdf062b313cef10fa882f0860d32864bad6c6b2..5a86f7dbd2aa3fad0a95520ef8646240eae71b4e 100644 (file)
--- a/Freeswitch.sln
+++ b/Freeswitch.sln
@@ -600,6 +600,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "m4", "m4", "{CDE9B06A-3C27-
                build\config\ax_compiler_vendor.m4 = build\config\ax_compiler_vendor.m4\r
        EndProjectSection\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_h26x", "src\mod\codecs\mod_h26x\mod_h26x.vcproj", "{2C3C2423-234B-4772-8899-D3B137E5CA35}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -1122,6 +1124,12 @@ Global
                {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.ActiveCfg = Release Passthrough|Win32\r
                {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|Win32.Build.0 = Release Passthrough|Win32\r
                {8DEB383C-4091-4F42-A56F-C9E46D552D79}.Release|x64.ActiveCfg = Release|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|Win32.Build.0 = Debug|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Debug|x64.ActiveCfg = Debug|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.ActiveCfg = Release|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|Win32.Build.0 = Release|Win32\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35}.Release|x64.ActiveCfg = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -1137,6 +1145,7 @@ Global
                {D42518CC-7475-454D-B392-0E132C07D761} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {FEA1EEF7-876F-48DE-88BF-C0E3E606D758} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {8DEB383C-4091-4F42-A56F-C9E46D552D79} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
+               {2C3C2423-234B-4772-8899-D3B137E5CA35} = {F881ADA2-2F1A-4046-9FEB-191D9422D781}\r
                {3A2A7795-C216-4FFF-B8EF-4D17A84BACCC} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}\r
                {F10BE67C-A8FF-4CB2-AF29-D46D2590DC59} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}\r
                {C7705DC4-2088-493E-AF8D-65BC6D65C125} = {9ADF1E48-2F5C-4ED7-A893-596259FABFE0}\r

diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index dbba4fdfcf4984fb2cc24774f01207d72c5a08ae..3cfcd8a15470ea0b2bd64adc99d4be6dd91b702f 100644 (file)
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -348,7 +348,7 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
 */
 SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
                                                                                        void *data,
-                                                                                       uint16_t datalen,
+                                                                                       uint32_t datalen,
                                                                                        uint8_t m, switch_payload_t payload, uint32_t ts, uint16_t mseq, uint32_t ssrc, switch_frame_flag_t *flags);
 
 /*! 

diff --git a/src/mod/codecs/mod_h26x/mod_h26x.vcproj b/src/mod/codecs/mod_h26x/mod_h26x.vcproj
index 2e66ff5a31090c643de41175921ce0218b301380..1205ac5e7c05fe8bc9a8c5f5e9a2309a194598ad 100644 (file)
--- a/src/mod/codecs/mod_h26x/mod_h26x.vcproj
+++ b/src/mod/codecs/mod_h26x/mod_h26x.vcproj
@@ -3,7 +3,7 @@
        ProjectType="Visual C++"\r
        Version="8.00"\r
        Name="mod_h26x"\r
-       ProjectGUID="{5844AFE1-AA3E-4BDB-A9EF-119AEF19DF88}"\r
+       ProjectGUID="{2C3C2423-234B-4772-8899-D3B137E5CA35}"\r
        RootNamespace="mod_h26x"\r
        Keyword="Win32Proj"\r
        >\r

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index c18955512b19bad663876c49803297934acdebb5..aec2cb0e22ccfc0d0fc23bb81e39ae4229a9c085 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1146,7 +1146,7 @@ SWITCH_DECLARE(switch_status_t) switch_rtp_zerocopy_read_frame(switch_rtp_t *rtp
        frame->source = __FILE__;
        frame->flags |= SFF_RAW_RTP;
        frame->timestamp = ntohl(rtp_session->recv_msg.header.ts);
-       frame->seq = ntohs(rtp_session->recv_msg.header.seq);
+       frame->seq = (uint16_t)ntohs((u_short)rtp_session->recv_msg.header.seq);
        frame->ssrc = ntohl(rtp_session->recv_msg.header.ssrc);
        frame->m = rtp_session->recv_msg.header.m ? SWITCH_TRUE : SWITCH_FALSE;
 
@@ -1488,7 +1488,7 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
 
        if (switch_test_flag(frame, SFF_RTP_HEADER)) {
                return switch_rtp_write_manual(rtp_session, frame->data, frame->datalen, frame->m, frame->payload, 
-                                                                          frame->timestamp, frame->seq, frame->ssrc, &frame->flags);
+                                                                          (uint32_t)(frame->timestamp), frame->seq, frame->ssrc, &frame->flags);
        }
 
 
@@ -1521,7 +1521,7 @@ SWITCH_DECLARE(int) switch_rtp_write_frame(switch_rtp_t *rtp_session, switch_fra
 
 SWITCH_DECLARE(int) switch_rtp_write_manual(switch_rtp_t *rtp_session,
                                                                                        void *data,
-                                                                                       uint16_t datalen,
+                                                                                       uint32_t datalen,
                                                                                        uint8_t m, switch_payload_t payload, uint32_t ts, uint16_t mseq, uint32_t ssrc, switch_frame_flag_t *flags)
 {
        rtp_msg_t send_msg = { {0} };