|
@@ -371,13 +371,10 @@ class oa2RtspStartView(TemplateView):
|
|
|
'expirationTime': expirationTime,
|
|
'expirationTime': expirationTime,
|
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
|
|
|
|
|
|
- 'audioCodecs': 'G711A',
|
|
|
|
|
|
|
+ 'audioCodecs': 'G711',
|
|
|
'videoCodecs': 'H264',
|
|
'videoCodecs': 'H264',
|
|
|
- 'protocols': ['RTSP'],
|
|
|
|
|
- 'idleTimeoutSeconds': 5,
|
|
|
|
|
- 'modelName': 'P1425-LE',
|
|
|
|
|
- 'authorizationTypes': ['NONE'],
|
|
|
|
|
- 'manufacturerId': 'zosi-ACCC8E5E7513',
|
|
|
|
|
|
|
+ 'protocols': 'RTSP',
|
|
|
|
|
+ 'authorizationTypes': 'NONE',
|
|
|
'resolutions': {'width': 640, 'height': 360},
|
|
'resolutions': {'width': 640, 'height': 360},
|
|
|
}
|
|
}
|
|
|
logger.info('------------返回控制摄像头的信息---------------: {}'.format(res_json))
|
|
logger.info('------------返回控制摄像头的信息---------------: {}'.format(res_json))
|
|
@@ -580,11 +577,9 @@ class oa2DiscoveryDevice(TemplateView):
|
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
'description': 'Camera connected via {}'.format(skill_name),
|
|
|
|
|
|
|
|
'protocols': ['RTSP'],
|
|
'protocols': ['RTSP'],
|
|
|
- 'audioCodecs': ['G711A'],
|
|
|
|
|
|
|
+ 'audioCodecs': ['G711'],
|
|
|
'videoCodecs': ['H264'],
|
|
'videoCodecs': ['H264'],
|
|
|
- 'modelName': 'P1425-LE',
|
|
|
|
|
'authorizationTypes': ['NONE'],
|
|
'authorizationTypes': ['NONE'],
|
|
|
- 'manufacturerId': 'zosi-ACCC8E5E7513',
|
|
|
|
|
'resolutions': [{'width': 640, 'height': 360}],
|
|
'resolutions': [{'width': 640, 'height': 360}],
|
|
|
}
|
|
}
|
|
|
res_json.append(ur_data)
|
|
res_json.append(ur_data)
|