diff --git a/trunk/winbuild/srs-librtmp.def b/trunk/winbuild/srs-librtmp.def deleted file mode 100644 index b35612186..000000000 --- a/trunk/winbuild/srs-librtmp.def +++ /dev/null @@ -1,46 +0,0 @@ -LIBRARY -EXPORTS -srs_rtmp_create -srs_rtmp_create2 -srs_rtmp_destroy -srs_rtmp_handshake -srs_rtmp_connect_app -srs_rtmp_connect_app2 -srs_rtmp_play_stream -srs_rtmp_publish_stream -srs_rtmp_read_packet -srs_rtmp_write_packet -srs_version_major -srs_version_minor -srs_version_revision -srs_utils_parse_timestamp -srs_human_format_time -srs_human_print_rtmp_packet -srs_rtmp_bandwidth_check -; -__srs_rtmp_do_simple_handshake -__srs_rtmp_connect_server -__srs_rtmp_dns_resolve - -;;;;;;;;for flv read/write;;;;;;;; -srs_flv_open_read -srs_flv_open_write -srs_flv_close -srs_flv_read_header -srs_flv_read_tag_header -srs_flv_read_tag_data -srs_flv_write_header -srs_flv_write_tag -srs_flv_size_tag -srs_flv_tellg -srs_flv_lseek -srs_flv_is_eof -srs_flv_is_sequence_header -srs_flv_is_keyframe - -;;;;;;;;for h264 read/write;;;;;;;; -srs_h264_write_raw_frames -srs_h264_is_dvbsp_error -srs_h264_is_duplicated_sps_error -srs_h264_is_duplicated_pps_error -srs_h264_startswith_annexb diff --git a/trunk/winbuild/srs-librtmp_vs2010.sln b/trunk/winbuild/srs-librtmp_vs2010.sln deleted file mode 100644 index 204bf81ac..000000000 --- a/trunk/winbuild/srs-librtmp_vs2010.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srs-librtmp", "srs-librtmp_vs2010.vcxproj", "{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srs_play", "srs_play.vcxproj", "{5149B9A9-5085-4A10-AD6F-23FBE6854390}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Debug|Win32.ActiveCfg = Debug|Win32 - {051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Debug|Win32.Build.0 = Debug|Win32 - {051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Release|Win32.ActiveCfg = Release|Win32 - {051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Release|Win32.Build.0 = Release|Win32 - {5149B9A9-5085-4A10-AD6F-23FBE6854390}.Debug|Win32.ActiveCfg = Debug|Win32 - {5149B9A9-5085-4A10-AD6F-23FBE6854390}.Debug|Win32.Build.0 = Debug|Win32 - {5149B9A9-5085-4A10-AD6F-23FBE6854390}.Release|Win32.ActiveCfg = Release|Win32 - {5149B9A9-5085-4A10-AD6F-23FBE6854390}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/trunk/winbuild/srs-librtmp_vs2010.vcxproj b/trunk/winbuild/srs-librtmp_vs2010.vcxproj deleted file mode 100644 index 08cc6ead0..000000000 --- a/trunk/winbuild/srs-librtmp_vs2010.vcxproj +++ /dev/null @@ -1,137 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {051CC3D8-5A99-4534-90EE-AED40EDDEEB2} - Win32Proj - srslibrtmp - srs-librtmp - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - true - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;SRSLIBRTMP_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\src\rtmp;..\src\libs;..\src\kernel;..\src\core;.\;%(AdditionalIncludeDirectories) - - - Windows - true - ws2_32.lib;%(AdditionalDependencies) - srs-librtmp.def - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;SRSLIBRTMP_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - ..\src\rtmp;..\src\libs;..\src\kernel;..\src\core;.\;%(AdditionalIncludeDirectories) - - - Windows - true - true - true - srs-librtmp.def - ws2_32.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/trunk/winbuild/srs-librtmp_vs2010.vcxproj.filters b/trunk/winbuild/srs-librtmp_vs2010.vcxproj.filters deleted file mode 100644 index 5c3da3219..000000000 --- a/trunk/winbuild/srs-librtmp_vs2010.vcxproj.filters +++ /dev/null @@ -1,156 +0,0 @@ - - - - - {8e33c6db-7a35-4d09-92d0-cc28491abbd6} - - - {eac81f26-3b4f-4905-85c5-2c0b915107b0} - - - {cbb45db3-c682-48bd-9a8c-1ae081aeddbf} - - - {6a284cec-b287-4aeb-b991-e11ebb4be6ec} - - - - - core - - - core - - - core - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - libs - - - libs - - - libs - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - - - core - - - core - - - core - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - kernel - - - libs - - - libs - - - libs - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - rtmp - - - - - - \ No newline at end of file diff --git a/trunk/winbuild/srs_auto_headers.hpp b/trunk/winbuild/srs_auto_headers.hpp deleted file mode 100644 index 4ebef350b..000000000 --- a/trunk/winbuild/srs_auto_headers.hpp +++ /dev/null @@ -1,56 +0,0 @@ -// auto generated by configure -#ifndef SRS_AUTO_HEADER_HPP -#define SRS_AUTO_HEADER_HPP - -#define SRS_AUTO_BUILD_TS "1416731672" -#define SRS_AUTO_BUILD_DATE "2014-11-23 16:34:32" -#define SRS_AUTO_UNAME "WIN_NT-6.1 WZY-PC2 1.0.18(0.48/3/2) 2012-11-21 22:34 i686 WINNT" -#define SRS_AUTO_USER_CONFIGURE "--x86-x64 --export-librtmp-project=../srs-librtmp" -#define SRS_AUTO_CONFIGURE "--prefix=/usr/local/srs --without-hls --without-dvr --without-nginx --without-ssl --without-ffmpeg --without-transcode --without-ingest --without-stat --without-http-callback --without-http-server --without-http-api --with-librtmp --with-research --without-utest --without-gperf --without-gmc --without-gmp --without-gcp --without-gprof --without-arm-ubuntu12 --without-mips-ubuntu12 --log-trace" - -#define SRS_AUTO_EMBEDED_TOOL_CHAIN "normal x86/x64 gcc" - -#undef SRS_AUTO_HTTP_PARSER -#undef SRS_AUTO_HTTP_SERVER -#undef SRS_AUTO_HTTP_API -#undef SRS_AUTO_NGINX -#undef SRS_AUTO_DVR -#undef SRS_AUTO_HLS -#undef SRS_AUTO_HTTP_CALLBACK -#undef SRS_AUTO_SSL -#undef SRS_AUTO_FFMPEG_TOOL -#undef SRS_AUTO_FFMPEG_STUB -#undef SRS_AUTO_TRANSCODE -#undef SRS_AUTO_INGEST -#undef SRS_AUTO_STAT -#undef SRS_AUTO_GPERF -#undef SRS_AUTO_GPERF_MC -#undef SRS_AUTO_GPERF_MP -#undef SRS_AUTO_GPERF_CP -#undef SRS_AUTO_EMBEDED_CPU -#undef SRS_AUTO_ARM_UBUNTU12 -#undef SRS_AUTO_MIPS_UBUNTU12 - -#undef SRS_AUTO_VERBOSE -#undef SRS_AUTO_INFO -#define SRS_AUTO_TRACE - -#define SRS_AUTO_PREFIX "/usr/local/srs" - -#define SRS_AUTO_CONSTRIBUTORS "\ -winlin \ -wenjie.zhao<740936897@qq.com> \ -xiangcheng.liu \ -naijia.liu \ -alcoholyi \ -byteman \ -chad.wang \ -suhetao \ -Johnny \ -karthikeyan \ -StevenLiu \ -zhengfl \ -" - -#endif - diff --git a/trunk/winbuild/srs_play.cpp b/trunk/winbuild/srs_play.cpp deleted file mode 100644 index 2891e3a3e..000000000 --- a/trunk/winbuild/srs_play.cpp +++ /dev/null @@ -1,89 +0,0 @@ -/* -The MIT License (MIT) - -Copyright (c) 2013-2014 winlin - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -*/ -/** -gcc srs_play.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_play -*/ - -#include -#include - -#include "srs_librtmp.hpp" - -int main(int argc, char** argv) -{ - printf("suck rtmp stream like rtmpdump\n"); - printf("srs(simple-rtmp-server) client librtmp library.\n"); - printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); - - if (argc <= 1) { - printf("Usage: %s \n" - " rtmp_url RTMP stream url to play\n" - "For example:\n" - " %s rtmp://127.0.0.1:1935/live/livestream\n", - argv[0], argv[0]); - exit(-1); - } - - srs_human_trace("rtmp url: %s", argv[1]); - srs_rtmp_t rtmp = srs_rtmp_create(argv[1]); - - if (srs_rtmp_handshake(rtmp) != 0) { - srs_human_trace("simple handshake failed."); - goto rtmp_destroy; - } - srs_human_trace("simple handshake success"); - - if (srs_rtmp_connect_app(rtmp) != 0) { - srs_human_trace("connect vhost/app failed."); - goto rtmp_destroy; - } - srs_human_trace("connect vhost/app success"); - - if (srs_rtmp_play_stream(rtmp) != 0) { - srs_human_trace("play stream failed."); - goto rtmp_destroy; - } - srs_human_trace("play stream success"); - - for (;;) { - int size; - char type; - char* data; - u_int32_t timestamp; - - if (srs_rtmp_read_packet(rtmp, &type, ×tamp, &data, &size) != 0) { - goto rtmp_destroy; - } - - if (srs_human_print_rtmp_packet(type, timestamp, data, size) != 0) { - goto rtmp_destroy; - } - - free(data); - } - -rtmp_destroy: - srs_rtmp_destroy(rtmp); - - return 0; -} diff --git a/trunk/winbuild/srs_play.vcxproj b/trunk/winbuild/srs_play.vcxproj deleted file mode 100755 index 22d653d2b..000000000 --- a/trunk/winbuild/srs_play.vcxproj +++ /dev/null @@ -1,88 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {5149B9A9-5085-4A10-AD6F-23FBE6854390} - Win32Proj - srs_play - - - - Application - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - true - - - false - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ..\src\core;..\src\libs;%(AdditionalIncludeDirectories) - - - Console - true - srs-librtmp.lib;%(AdditionalDependencies) - ./debug;%(AdditionalLibraryDirectories) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - Console - true - true - true - - - - - - - - - - - - \ No newline at end of file diff --git a/trunk/winbuild/srs_play.vcxproj.filters b/trunk/winbuild/srs_play.vcxproj.filters deleted file mode 100755 index c66bb8bc0..000000000 --- a/trunk/winbuild/srs_play.vcxproj.filters +++ /dev/null @@ -1,27 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - \ No newline at end of file