|
@@ -356,7 +356,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
thread.start()
|
|
thread.start()
|
|
|
|
|
|
|
|
# 拉流地址
|
|
# 拉流地址
|
|
|
- rtsp_uri = '{}://{}:443/{}'.format(RTSPS_PREFIX, RESP_SERVER_DOMAIN, stream_name)
|
|
|
|
|
|
|
+ rtsp_uri = '{}://{}:443/{}'.format(RTSP_PREFIX, RESP_SERVER_DOMAIN, stream_name)
|
|
|
stop_time = int(time.time()) + 2 * 60
|
|
stop_time = int(time.time()) + 2 * 60
|
|
|
expirationTime = time.strftime('%Y-%m-%dT%H:%MZ', time.localtime(stop_time))
|
|
expirationTime = time.strftime('%Y-%m-%dT%H:%MZ', time.localtime(stop_time))
|
|
|
|
|
|
|
@@ -373,7 +373,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
|
|
|
|
|
'audioCodecs': 'AAC',
|
|
'audioCodecs': 'AAC',
|
|
|
'videoCodecs': 'H264',
|
|
'videoCodecs': 'H264',
|
|
|
- 'protocols': ['RTSPS'],
|
|
|
|
|
|
|
+ 'protocols': ['RTSP'],
|
|
|
'idleTimeoutSeconds': 5,
|
|
'idleTimeoutSeconds': 5,
|
|
|
'modelName': 'P1425-LE',
|
|
'modelName': 'P1425-LE',
|
|
|
'authorizationTypes': ['NONE'],
|
|
'authorizationTypes': ['NONE'],
|
|
@@ -571,7 +571,7 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
uid_rtsp_id_list.append(uid_rtsp_qs.id)
|
|
uid_rtsp_id_list.append(uid_rtsp_qs.id)
|
|
|
|
|
|
|
|
rtsp_domain = RESP_SERVER_DOMAIN_DATA[region_code]
|
|
rtsp_domain = RESP_SERVER_DOMAIN_DATA[region_code]
|
|
|
- rtsp_uri = '{}://{}:443/{}'.format(RTSPS_PREFIX, rtsp_domain, rtsp_url)
|
|
|
|
|
|
|
+ rtsp_uri = '{}://{}:443/{}'.format(RTSP_PREFIX, rtsp_domain, rtsp_url)
|
|
|
ur_data = {
|
|
ur_data = {
|
|
|
'uri': rtsp_uri,
|
|
'uri': rtsp_uri,
|
|
|
'endpointId': uid,
|
|
'endpointId': uid,
|
|
@@ -579,7 +579,7 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
'manufacturerName': skill_name,
|
|
'manufacturerName': skill_name,
|
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
|
|
|
|
|
|
- 'protocols': ['RTSPS'],
|
|
|
|
|
|
|
+ 'protocols': ['RTSP'],
|
|
|
'audioCodecs': ['AAC'],
|
|
'audioCodecs': ['AAC'],
|
|
|
'videoCodecs': ['H264'],
|
|
'videoCodecs': ['H264'],
|
|
|
'modelName': 'P1425-LE',
|
|
'modelName': 'P1425-LE',
|