[AITT] Remove AITT connection

Remove AITT connection since AITT has been deprecated. Signed-off-by: gichan2-jang <[email protected]>
nnstreamer · Sep 9, 2024 · 8226b8c · 8226b8c
1 parent 487e553
commit 8226b8c
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 1,347 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,6 @@ OPTION(ENABLE_TIZEN     "Enable Tizen build" OFF)
 
 # Default features. You may change the features according to your needs.
 OPTION(MQTT_SUPPORT     "Enable MQTT" OFF)
-OPTION(AITT_SUPPORT     "Enable AITT" OFF)
 
 IF (NOT DEFINED VERSION)
     SET(VERSION    0.2.6)
@@ -58,12 +57,6 @@ IF(ENABLE_TIZEN)
     SET(REQUIRE_PKGS "${REQUIRE_PKGS} dlog")
 ENDIF()
 
-# AITT Library
-IF(AITT_SUPPORT)
-    SET(REQUIRE_PKGS "${REQUIRE_PKGS} aitt")
-    SET(NNS_EDGE_FLAGS "${NNS_EDGE_FLAGS} -DENABLE_AITT=1")
-ENDIF()
-
 IF(NOT ${REQUIRE_PKGS} STREQUAL "")
     PKG_CHECK_MODULES(EDGE_REQUIRE_PKGS REQUIRED ${REQUIRE_PKGS})
     ADD_DEFINITIONS(${EDGE_REQUIRE_PKGS_CFLAGS})

diff --git a/include/nnstreamer-edge.h b/include/nnstreamer-edge.h
@@ -46,7 +46,6 @@ typedef enum {
   NNS_EDGE_CONNECT_TYPE_TCP = 0,
   NNS_EDGE_CONNECT_TYPE_MQTT,
   NNS_EDGE_CONNECT_TYPE_HYBRID,
-  NNS_EDGE_CONNECT_TYPE_AITT,
   NNS_EDGE_CONNECT_TYPE_CUSTOM,
 
   NNS_EDGE_CONNECT_TYPE_UNKNOWN
@@ -124,18 +123,18 @@ typedef enum {
  * // Information that needs to be set according to the node and connection type.
  * // 1. Query-server-src:
  * //  - All connection type: HOST, PORT, CAPS
- * //  - Hybrid and AITT: DEST_HOST, DEST_PORT, TOPIC
+ * //  - Hybrid and MQTT: DEST_HOST, DEST_PORT, TOPIC
  * // 2. Query-server-sink:
  * //  - All connection type: CAPS
  * // 3. Query-client
  * //  - All connection type: HOST, PORT, CAPS
- * //  - Hybrid and AITT: TOPIC
+ * //  - Hybrid and MQTT: TOPIC
  * // 4. Stream-sink
  * //  - All connection type: HOST, PORT
- * //  - Hybrid and AITT: DEST_HOST, DEST_PORT, TOPIC
+ * //  - Hybrid and MQTT: DEST_HOST, DEST_PORT, TOPIC
  * // 5. Stream-src
  * //  - All connection type: HOST, PORT
- * //  - Hybrid and AITT: DEST_HOST, DEST_PORT, TOPIC
+ * //  - Hybrid and MQTT: DEST_HOST, DEST_PORT, TOPIC
  *
  * // Set information for query-client of TCP connection.
  * ret = nns_edge_set_info (edge_h, "HOST", "127.0.0.1");
@@ -215,10 +214,10 @@ int nns_edge_release_handle (nns_edge_h edge_h);
 int nns_edge_set_event_callback (nns_edge_h edge_h, nns_edge_event_cb cb, void *user_data);
 
 /**
- * @brief Connect to the destination node. In the case of Hybrid and AITT, the TOPIC, DEST_HOST and DEST_PORT must be set before connection using nns_edge_set_info().
+ * @brief Connect to the destination node. In the case of Hybrid and MQTT, the TOPIC, DEST_HOST and DEST_PORT must be set before connection using nns_edge_set_info().
  * @param[in] edge_h The edge handle.
- * @param[in] dest_host IP address to connect. In case of TCP connection, it is the IP address of the destination node, and in the case of Hybrid or AITT connection, it is the IP of the broker.
- * @param[in] dest_port The network port to connect. In case of TCP connection, it is the port of the destination node, and in the case of Hybrid or AITT connection, it is the port of the broker.
+ * @param[in] dest_host IP address to connect. In case of TCP connection, it is the IP address of the destination node, and in the case of Hybrid or MQTT connection, it is the IP of the broker.
+ * @param[in] dest_port The network port to connect. In case of TCP connection, it is the port of the destination node, and in the case of Hybrid or MQTT connection, it is the port of the broker.
  * @return 0 on success. Otherwise a negative error value.
  * @retval #NNS_EDGE_ERROR_NONE Successful.
  * @retval #NNS_EDGE_ERROR_NOT_SUPPORTED Not supported.
@@ -302,8 +301,8 @@ int nns_edge_is_connected (nns_edge_h edge_h);
  * CAPS or CAPABILITY   | capability strings.
  * IP or HOST           | IP address of the node to accept connection from other node.
  * PORT                 | Port of the node to accept connection from other node. The value should be 0 or higher, if the port is set to 0 then the available port is allocated.
- * DEST_IP or DEST_HOST | IP address of the destination node. In case of TCP connection, it is the IP address of the destination node, and in the case of Hybrid or AITT connection, it is the IP address of the broker.
- * DEST_PORT            | Port of the destination node. In case of TCP connection, it is the port number of the destination node, and in the case of Hybrid or AITT connection, it is the port number of the broker. The value should be 0 or higher.
+ * DEST_IP or DEST_HOST | IP address of the destination node. In case of TCP connection, it is the IP address of the destination node, and in the case of Hybrid or MQTT connection, it is the IP address of the broker.
+ * DEST_PORT            | Port of the destination node. In case of TCP connection, it is the port number of the destination node, and in the case of Hybrid or MQTT connection, it is the port number of the broker. The value should be 0 or higher.
  * TOPIC                | Topic used to publish/subscribe to/from the broker.
  * QUEUE_SIZE           | Max number of data in the queue, when sending edge data to other node. Default 0 means unlimited. N:<leaky [NEW, OLD]> where leaky 'OLD' drops old buffer (default NEW). (e.g., QUEUE_SIZE=5:OLD drops old buffer and pushes new data when queue size reaches 5.)
  * ID or CLIENT_ID      | Unique identifier of the edge handle or client ID. (Read-only)

diff --git a/jni/nnstreamer-edge.mk b/jni/nnstreamer-edge.mk
@@ -18,5 +18,3 @@ NNSTREAMER_EDGE_SRCS := \
     $(NNSTREAMER_EDGE_ROOT)/src/libnnstreamer-edge/nnstreamer-edge-queue.c \
     $(NNSTREAMER_EDGE_ROOT)/src/libnnstreamer-edge/nnstreamer-edge-util.c
 
-# TODO: Add mqtt and aitt
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -20,10 +20,6 @@ IF(MQTT_SUPPORT)
     ENDIF()
 ENDIF()
 
-IF(AITT_SUPPORT)
-    SET(NNS_EDGE_SRCS ${NNS_EDGE_SRCS} ${NNS_EDGE_SRC_DIR}/nnstreamer-edge-aitt.c)
-ENDIF()
-
 ADD_LIBRARY(${NNS_EDGE_LIB_NAME} SHARED ${NNS_EDGE_SRCS})
 SET_TARGET_PROPERTIES(${NNS_EDGE_LIB_NAME} PROPERTIES VERSION ${SO_VERSION})
 TARGET_INCLUDE_DIRECTORIES(${NNS_EDGE_LIB_NAME} PRIVATE ${INCLUDE_DIR} ${EDGE_REQUIRE_PKGS_INCLUDE_DIRS})
@@ -37,11 +33,6 @@ IF(MQTT_SUPPORT)
     ENDIF()
 ENDIF()
 
-IF(AITT_SUPPORT)
-    TARGET_LINK_LIBRARIES(${NNS_EDGE_LIB_NAME} ${AITT_LIB})
-    TARGET_INCLUDE_DIRECTORIES(${NNS_EDGE_LIB_NAME} PUBLIC ${AITT_INCLUDE_DIR})
-ENDIF()
-
 INSTALL (TARGETS ${NNS_EDGE_LIB_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 INSTALL (FILES ${INCLUDE_DIR}/nnstreamer-edge.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INSTALL (FILES ${INCLUDE_DIR}/nnstreamer-edge-custom.h DESTINATION ${INCLUDE_INSTALL_DIR})