1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
|
--- a/packages/libARController/Includes/libARController/ARCONTROLLER_Stream.h
+++ b/packages/libARController/Includes/libARController/ARCONTROLLER_Stream.h
@@ -38,7 +38,7 @@
#ifndef _ARCONTROLLER_STREAM_H_
#define _ARCONTROLLER_STREAM_H_
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Thread.h>
#include <libARNetwork/ARNETWORK_Manager.h>
#include <libARController/ARCONTROLLER_Error.h>
--- a/packages/libARController/Includes/libARController/ARCONTROLLER_Stream1.h
+++ b/packages/libARController/Includes/libARController/ARCONTROLLER_Stream1.h
@@ -38,7 +38,7 @@
#ifndef _ARCONTROLLER_STREAM1_H_
#define _ARCONTROLLER_STREAM1_H_
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Thread.h>
#include <libARNetwork/ARNETWORK_Manager.h>
#include <libARController/ARCONTROLLER_Error.h>
--- a/packages/libARController/Python/generateDeviceControllers.py
+++ b/packages/libARController/Python/generateDeviceControllers.py
@@ -836,7 +836,7 @@ def generateDeviceControllers (ctx, SRC_DIR, INC_DIR):
cFile.write ('#include <stdio.h>\n')
cFile.write ('#include <time.h>\n')
- cFile.write ('#include <json/json.h>\n')
+ cFile.write ('#include <json-c/json.h>\n')
cFile.write ('\n')
cFile.write ('#include <libARSAL/ARSAL_Mutex.h>\n')
--- a/packages/libARController/Sources/ARCONTROLLER_Stream.c
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream.c
@@ -38,7 +38,7 @@
#include <stdlib.h>
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Print.h>
#include <libARSAL/ARSAL_Socket.h>
#include <libARStream/ARStream.h>
--- a/packages/libARController/Sources/ARCONTROLLER_Stream1.c
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream1.c
@@ -38,7 +38,7 @@
#include <stdlib.h>
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Print.h>
#include <libARSAL/ARSAL_Socket.h>
#include <libARStream/ARStream.h>
--- a/packages/libARController/Sources/ARCONTROLLER_Stream2.c
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream2.c
@@ -38,7 +38,7 @@
#include <stdlib.h>
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Print.h>
#include <libARSAL/ARSAL_Socket.h>
#include <libARSAL/ARSAL_Thread.h>
--- a/packages/libARController/Sources/ARCONTROLLER_Stream2.h
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream2.h
@@ -39,7 +39,7 @@
#ifndef _ARCONTROLLER_STREAM2_PRIVATE_H_
#define _ARCONTROLLER_STREAM2_PRIVATE_H_
-#include <json/json.h>
+#include <json-c/json.h>
#include <libARSAL/ARSAL_Socket.h>
#include <libARSAL/ARSAL_Thread.h>
#include <libARController/ARCONTROLLER_Error.h>
--- a/packages/libARController/Sources/ARCONTROLLER_Stream1.c
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream1.c
@@ -503,21 +503,21 @@ eARDISCOVERY_ERROR ARCONTROLLER_Stream1_OnReceiveJson (ARCONTROLLER_Stream1_t *s
if (error == ARDISCOVERY_OK)
{
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream1Controller->fragmentSize = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream1Controller->maxNumberOfFragment = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream1Controller->maxAckInterval = json_object_get_int(valueJsonObj);
--- a/packages/libARController/Sources/ARCONTROLLER_Stream2.c
+++ b/packages/libARController/Sources/ARCONTROLLER_Stream2.c
@@ -345,48 +345,48 @@ eARDISCOVERY_ERROR ARCONTROLLER_Stream2_OnReceiveJson (ARCONTROLLER_Stream2_t *s
if (error == ARDISCOVERY_OK)
{
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->serverStreamPort = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->serverControlPort = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_PACKET_SIZE_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_PACKET_SIZE_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_PACKET_SIZE_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->maxPaquetSize = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_LATENCY_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_LATENCY_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_LATENCY_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->maxLatency = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_NETWORK_LATENCY_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_NETWORK_LATENCY_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_NETWORK_LATENCY_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->maxNetworkLatency = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_BITRATE_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_BITRATE_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_MAX_BITRATE_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
stream2Controller->maxBiterate = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_PARAMETER_SETS_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_PARAMETER_SETS_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_PARAMETER_SETS_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
int parmeterSetsLength = strlen(json_object_get_string(valueJsonObj));
@@ -409,10 +409,12 @@ eARDISCOVERY_ERROR ARCONTROLLER_Stream2_OnReceiveJson (ARCONTROLLER_Stream2_t *s
uint8_t ARCONTROLLER_Stream2_JsonContainsStream2Param(json_object *jsonObj)
{
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY
- json_object *serverStreamPortJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY);
+ json_object *serverStreamPortJsonObj = NULL;
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_STREAM_PORT_KEY, &serverStreamPortJsonObj);
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY
- json_object *serverControlPortJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY);
+ json_object *serverControlPortJsonObj = NULL;
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM2_SERVER_CONTROL_PORT_KEY, &serverControlPortJsonObj);
return ((serverStreamPortJsonObj != NULL) && (serverControlPortJsonObj != NULL));
}
--- a/packages/libARController/Sources/ARCONTROLLER_StreamSender.c
+++ b/packages/libARController/Sources/ARCONTROLLER_StreamSender.c
@@ -324,21 +324,21 @@ eARDISCOVERY_ERROR ARCONTROLLER_StreamSender_OnReceiveJson (ARCONTROLLER_StreamS
{
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_SIZE_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
streamController->fragmentSize = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_FRAGMENT_MAXIMUM_NUMBER_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
streamController->maxNumberOfFragment = json_object_get_int(valueJsonObj);
}
// get ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY
- valueJsonObj = json_object_object_get (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY);
+ json_object_object_get_ex (jsonObj, ARDISCOVERY_CONNECTION_JSON_ARSTREAM_MAX_ACK_INTERVAL_KEY, &valueJsonObj);
if (valueJsonObj != NULL)
{
streamController->maxAckInterval = json_object_get_int(valueJsonObj);
|