winlin

change to 0.9.22

@@ -167,6 +167,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv @@ -167,6 +167,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv
167 * nginx v1.5.0: 139524 lines <br/> 167 * nginx v1.5.0: 139524 lines <br/>
168 168
169 ### History 169 ### History
  170 +* v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream.
  171 +* v1.0, 2014-03-19, refine handshake, client support coplex handshake, add utest.
170 * v1.0, 2014-03-16, support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm)) with rtmp/ssl/hls/librtmp. 172 * v1.0, 2014-03-16, support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm)) with rtmp/ssl/hls/librtmp.
171 * v1.0, 2014-03-12, finish utest for amf0 codec. 173 * v1.0, 2014-03-12, finish utest for amf0 codec.
172 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. 174 * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile.
@@ -3,19 +3,4 @@ @@ -3,19 +3,4 @@
3 3
4 listen 1935; 4 listen 1935;
5 vhost __defaultVhost__ { 5 vhost __defaultVhost__ {
6 - transcode {  
7 - enabled on;  
8 - ffmpeg ./objs/ffmpeg/bin/ffmpeg;  
9 - engine vn {  
10 - enabled on;  
11 - vcodec vn;  
12 - acodec libaacplus;  
13 - abitrate 45;  
14 - asample_rate 44100;  
15 - achannels 2;  
16 - aparams {  
17 - }  
18 - output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine];  
19 - }  
20 - }  
21 } 6 }
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "21" 34 +#define VERSION_REVISION "22"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"