external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

migarate from winlinvip to srs org

Browse source
This commit is contained in:
winlin 2015-04-29 17:06:32 +08:00
parent b3bd007f0d
commit 115daa3cc1
117 changed files with 323 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/api-server/server.py
View file

@ -1282,7 +1282,7 @@ if len(sys.argv) <= 1:
print "For example:"
print " python %s 8085"%(sys.argv[0])
print ""
print "See also: https://github.com/winlinvip/simple-rtmp-server"
print "See also: https://github.com/simple-rtmp-server/srs"
sys.exit(1)
# parse port from user options.

2
trunk/research/api-server/static-dir/index.html
View file

@ -44,7 +44,7 @@
<div class="container">
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/arm/jmp.cpp
View file

@ -1,5 +1,5 @@
/*
# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm
g++ -g -O0 -o jmp jmp.cpp
arm-linux-gnueabi-g++ -o jmp jmp.cpp -static
arm-linux-gnueabi-strip jmp

4
trunk/research/arm/jmp_sp.cpp
View file

@ -1,6 +1,6 @@
/*
# see: https://github.com/winlinvip/simple-rtmp-server/issues/190
# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm
# see: https://github.com/simple-rtmp-server/srs/issues/190
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm
g++ -g -O0 -o jmp_sp jmp_sp.cpp
arm-linux-gnueabi-g++ -g -o jmp_sp jmp_sp.cpp -static
arm-linux-gnueabi-strip jmp_sp

2
trunk/research/arm/test.cpp
View file

@ -1,5 +1,5 @@
/*
# see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_SrsLinuxArm
# see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SrsLinuxArm
arm-linux-gnueabi-g++ -o test test.cpp -static
arm-linux-gnueabi-strip test
*/

2
trunk/research/librtmp/Makefile
View file

@ -38,7 +38,7 @@ help:
@echo "Remark: srs Makefile will auto invoke this by --with/without-ssl, "
@echo " that is, if user specified ssl(by --with-ssl), srs will make this by 'make ssl'"
@echo " that is, if user not use ssl(by --without-ssl), use 'make nossl'"
@echo " see: https://github.com/winlinvip/simple-rtmp-server/wiki/v1_CN_v1_Build"
@echo " see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_v1_Build"
@echo "Remark: before make this sample, user must make the srs, with/without ssl"
clean:

4
trunk/research/librtmp/srs_aac_raw_publish.c
View file

@ -35,7 +35,7 @@ gcc srs_aac_raw_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_aa
#include "../../objs/include/srs_librtmp.h"
// https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-64145910
// https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-64145910
int read_audio_frame(char* data, int size, char** pp, char** frame, int* frame_size)
{
char* p = *pp;
@ -79,7 +79,7 @@ int main(int argc, char** argv)
printf("For example:\n");
printf(" %s ./audio.raw.aac rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.aac\n");
printf("See: https://github.com/winlinvip/simple-rtmp-server/issues/212\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/212\n");
exit(-1);
}

4
trunk/research/librtmp/srs_audio_raw_publish.c
View file

@ -35,7 +35,7 @@ gcc srs_audio_raw_publish.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_
#include "../../objs/include/srs_librtmp.h"
// https://github.com/winlinvip/simple-rtmp-server/issues/212#issuecomment-63648892
// https://github.com/simple-rtmp-server/srs/issues/212#issuecomment-63648892
// allspace:
// Take this file as an example: https://github.com/allspace/files/blob/master/srs.pcm
// It's captured using SDK callback method. I have filtered out h264 video, so it's audio only now.
@ -77,7 +77,7 @@ int main(int argc, char** argv)
printf("For example:\n");
printf(" %s ./audio.raw.pcm rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/audio.raw.pcm\n");
printf("See: https://github.com/winlinvip/simple-rtmp-server/issues/212\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/212\n");
exit(-1);
}

2
trunk/research/librtmp/srs_h264_raw_publish.c
View file

@ -89,7 +89,7 @@ int main(int argc, char** argv)
printf("For example:\n");
printf(" %s ./720p.h264.raw rtmp://127.0.0.1:1935/live/livestream\n", argv[0]);
printf("Where the file: http://winlinvip.github.io/srs.release/3rdparty/720p.h264.raw\n");
printf("See: https://github.com/winlinvip/simple-rtmp-server/issues/66\n");
printf("See: https://github.com/simple-rtmp-server/srs/issues/66\n");
exit(-1);
}

4
trunk/research/librtmp/srs_publish.c
View file

@ -46,12 +46,12 @@ int main(int argc, char** argv)
}
// warn it .
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/126
// @see: https://github.com/simple-rtmp-server/srs/issues/126
srs_human_trace("\033[33m%s\033[0m",
"[warning] it's only a sample to use librtmp. "
"please never use it to publish and test forward/transcode/edge/HLS whatever. "
"you should refer to this tool to use the srs-librtmp to publish the real media stream."
"read about: https://github.com/winlinvip/simple-rtmp-server/issues/126");
"read about: https://github.com/simple-rtmp-server/srs/issues/126");
srs_human_trace("rtmp url: %s", argv[1]);
srs_rtmp_t rtmp = srs_rtmp_create(argv[1]);

2
trunk/research/players/index.html
View file

@ -56,7 +56,7 @@
<div class="container">
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/players/jwplayer6.html
View file

@ -126,7 +126,7 @@
</div>
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/players/osmf.html
View file

@ -116,7 +116,7 @@
</div>
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/players/srs_bwt.html
View file

@ -132,7 +132,7 @@
</div>
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
<div class="container">
<div id="player"></div>

2
trunk/research/players/srs_chat.html
View file

@ -781,7 +781,7 @@
</div>
<hr/>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

6
trunk/research/players/srs_player.html
View file

@ -306,7 +306,7 @@
<div class="container">
<hr/>
<span>
注意：必须按照<a href="https://github.com/winlinvip/simple-rtmp-server/wiki/SampleDemo">SRS DEMO</a>
注意：必须按照<a href="https://github.com/simple-rtmp-server/srs/wiki/SampleDemo">SRS DEMO</a>
启动和设置服务器，下面所有的链接才能观看。
</span>
<div class="accordion" id="main_accordion">
@ -471,7 +471,7 @@
<div id="main_modal" class="modal hide fade">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3><a href="https://github.com/winlinvip/simple-rtmp-server">SrsPlayer</a></h3>
<h3><a href="https://github.com/simple-rtmp-server/srs">SrsPlayer</a></h3>
</div>
<div class="modal-body">
<div id="player"></div>
@ -535,7 +535,7 @@
</div>
</div>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/players/srs_publisher.html
View file

@ -460,7 +460,7 @@
</div>
</div>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/players/vlc.html
View file

@ -45,7 +45,7 @@
<div class="container">
<hr>
<footer>
<p><a href="https://github.com/winlinvip/simple-rtmp-server">SRS Team &copy; 2013</a></p>
<p><a href="https://github.com/simple-rtmp-server/srs">SRS Team &copy; 2013</a></p>
</footer>
</div>
</body>

2
trunk/research/st/event.c
View file

@ -310,7 +310,7 @@ ST_HIDDEN void _st_epoll_dispatch(void)
if (_st_epoll_data->pid != getpid()) {
// WINLIN: remove it for bug introduced.
// @see: https://github.com/winlinvip/simple-rtmp-server/issues/193
// @see: https://github.com/simple-rtmp-server/srs/issues/193
exit(-1);
}