winlin

Merge branch 'srs.master'

@@ -227,6 +227,8 @@ fi @@ -227,6 +227,8 @@ fi
227 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then 227 if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
228 # check the arm flag file, if flag changed, need to rebuild the st. 228 # check the arm flag file, if flag changed, need to rebuild the st.
229 _ST_MAKE=linux-debug 229 _ST_MAKE=linux-debug
  230 + # memory leak for linux-optimized
  231 + # @see: https://github.com/winlinvip/simple-rtmp-server/issues/197
230 if [ $SRS_EMBEDED_CPU = YES ]; then 232 if [ $SRS_EMBEDED_CPU = YES ]; then
231 # ok, arm specified, if the flag filed does not exists, need to rebuild. 233 # ok, arm specified, if the flag filed does not exists, need to rebuild.
232 if [[ -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then 234 if [[ -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st/libst.a ]]; then
@@ -528,8 +528,8 @@ int SrsRtmpConn::playing(SrsSource* source) @@ -528,8 +528,8 @@ int SrsRtmpConn::playing(SrsSource* source)
528 // collect elapse for pithy print. 528 // collect elapse for pithy print.
529 pithy_print.elapse(); 529 pithy_print.elapse();
530 530
531 - // read message when no data to send.  
532 - // @see: https://github.com/winlinvip/simple-rtmp-server/issues/194 531 + // to use isolate thread to recv, can improve about 5% performance.
  532 + // @see: https://github.com/winlinvip/simple-rtmp-server/issues/196
533 // read from client. 533 // read from client.
534 if (true) { 534 if (true) {
535 SrsMessage* msg = NULL; 535 SrsMessage* msg = NULL;