winlin

fix bug of raspberry-pi build, static off

@@ -475,7 +475,7 @@ function apply_user_presets() { @@ -475,7 +475,7 @@ function apply_user_presets() {
475 SRS_GPERF_MP=NO 475 SRS_GPERF_MP=NO
476 SRS_GPERF_CP=NO 476 SRS_GPERF_CP=NO
477 SRS_GPROF=NO 477 SRS_GPROF=NO
478 - SRS_STATIC=YES 478 + SRS_STATIC=NO
479 fi 479 fi
480 } 480 }
481 apply_user_presets 481 apply_user_presets
@@ -597,7 +597,7 @@ class RESTNodes(object): @@ -597,7 +597,7 @@ class RESTNodes(object):
597 def __get_peers(self, target_node): 597 def __get_peers(self, target_node):
598 peers = [] 598 peers = []
599 for node in self.__nodes: 599 for node in self.__nodes:
600 - if node.id == target_node.id: 600 + if str(node.id).strip() == str(target_node.id).strip():
601 continue 601 continue
602 if node.public_ip == target_node.public_ip and node.srs_status == "running" and node.origin != target_node.ip: 602 if node.public_ip == target_node.public_ip and node.srs_status == "running" and node.origin != target_node.ip:
603 peers.append(node) 603 peers.append(node)
@@ -626,7 +626,7 @@ class RESTNodes(object): @@ -626,7 +626,7 @@ class RESTNodes(object):
626 target.clients += 1 626 target.clients += 1
627 return target.ip 627 return target.ip
628 628
629 - def GET(self, type=None, format=None, origin=None, vhost=None, port=None, stream=None): 629 + def GET(self, type=None, format=None, origin=None, vhost=None, port=None, stream=None, node_id=None):
630 enable_crossdomain() 630 enable_crossdomain()
631 631
632 self.__refresh_nodes() 632 self.__refresh_nodes()
@@ -665,7 +665,8 @@ class RESTNodes(object): @@ -665,7 +665,8 @@ class RESTNodes(object):
665 "rtmp-cztv-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=__defaultVhost__&port=1935&stream=live/rtmp_cztv01-sd", 665 "rtmp-cztv-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=__defaultVhost__&port=1935&stream=live/rtmp_cztv01-sd",
666 "hls-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/livestream", 666 "hls-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=html&origin=demo.chnvideo.com&port=8080&stream=live/livestream",
667 "hls-livestream-m3u8": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=m3u8&origin=demo.chnvideo.com&port=8080&stream=live/livestream", 667 "hls-livestream-m3u8": "http://demo.chnvideo.com:8085/api/v1/nodes?type=hls&format=m3u8&origin=demo.chnvideo.com&port=8080&stream=live/livestream",
668 - "rtmp-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=demo.srs.com&port=1935&stream=live/livestream" 668 + "rtmp-livestream-html": "http://demo.chnvideo.com:8085/api/v1/nodes?type=rtmp&format=html&origin=demo.chnvideo.com&vhost=demo.srs.com&port=1935&stream=live/livestream",
  669 + "apk": "http://demo.chnvideo.com/android.srs.apk"
669 } 670 }
670 }}) 671 }})
671 672