chanjunkai 5 anni fa
parent
commit
6343fbb2d0
2 ha cambiato i file con 15 aggiunte e 20 eliminazioni
  1. 4 4
      azoauth/config.py
  2. 11 16
      controller/index.py

+ 4 - 4
azoauth/config.py

@@ -20,8 +20,8 @@ RESP_SERVER_DOMAIN_DATA = {
 }
 SERVER_PREFIX = 'http://www.dvema.com'
 #Easydarwin
-PORT_PREFIX = '8554'
-# PORT_PREFIX = '554'
+# PORT_PREFIX = '8554'
+PORT_PREFIX = '554'
 # PORT_PREFIX = '443'
-# RTSP_PREFIX = 'rtsps'
-RTSP_PREFIX = 'rtsp'
+RTSP_PREFIX = 'rtsps'
+# RTSP_PREFIX = 'rtsp'

+ 11 - 16
controller/index.py

@@ -226,17 +226,17 @@ class oa2RtspStartView(TemplateView):
             #RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
             #rtsp://rtsp.zositech.xyz:443/elNGWlVURXRHU2swMlMwUlVRVVk1U2pFeE1VRT1M
             #E
-            MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
-                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
-                       stream_name=stream_name,
-                       PORT_PREFIX=PORT_PREFIX,
-                       RTSP_PREFIX=RTSP_PREFIX)
-            #zlm
-            # MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/live/{stream_name}'. \
+            # MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
             #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
             #            stream_name=stream_name,
             #            PORT_PREFIX=PORT_PREFIX,
             #            RTSP_PREFIX=RTSP_PREFIX)
+            #zlm
+            MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/live/{stream_name}'. \
+                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
+                       stream_name=stream_name,
+                       PORT_PREFIX=PORT_PREFIX,
+                       RTSP_PREFIX=RTSP_PREFIX)
             # po = Pool(10)
             # po.apply_async(self.runSendRtspMsg, (UID, PWD, MSG))
             print(UID)
@@ -257,15 +257,10 @@ class oa2RtspStartView(TemplateView):
                        stream_name=stream_name,
                        RTSP_PREFIX=RTSP_PREFIX)
             #zlm443
-            # rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/live/{stream_name}'. \
-            #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
-            #            stream_name=stream_name,
-            #            RTSP_PREFIX=RTSP_PREFIX)
-            #zlm322
-            # rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:322/live/{stream_name}'. \
-            #     format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
-            #            stream_name=stream_name,
-            #            RTSP_PREFIX=RTSP_PREFIX)
+            rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/live/{stream_name}'. \
+                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
+                       stream_name=stream_name,
+                       RTSP_PREFIX=RTSP_PREFIX)
             #----------新增关闭流的线程
             # stream_name = threading.Thread(target=self.runSendStop,args=(UID, PWD, MSG))
             # stream_name.start()