Add hapticSpatialDataSupported into VideoStreamingCapability

8 files changed, 18 insertions, 4 deletions

diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json
index 33ee842404..6e9a9e3194 100755
--- a/src/appMain/hmi_capabilities.json
+++ b/src/appMain/hmi_capabilities.json
@@ -310,7 +310,8 @@
                 "supportedFormats": [{
                     "protocol": "RAW",
                     "codec": "H264"
-                }]
+                }],
+                "hapticSpatialDataSupported": false
             }
         }
     },
@@ -436,4 +437,4 @@
         "majorVersion": 3,
         "minorVersion": 0
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/application_manager/include/application_manager/smart_object_keys.h b/src/components/application_manager/include/application_manager/smart_object_keys.h
index 388c4ed80d..24ba1bd1ba 100644
--- a/src/components/application_manager/include/application_manager/smart_object_keys.h
+++ b/src/components/application_manager/include/application_manager/smart_object_keys.h
@@ -351,6 +351,7 @@ extern const char* const resolution_width;
 extern const char* const resolution_height;
 extern const char* const max_bitrate;
 extern const char* const supported_formats;
+extern const char* const haptic_spatial_data_supported;
 }  // namespace strings
 
 namespace json {
diff --git a/src/components/application_manager/src/smart_object_keys.cc b/src/components/application_manager/src/smart_object_keys.cc
index 355314086f..8bde87f493 100644
--- a/src/components/application_manager/src/smart_object_keys.cc
+++ b/src/components/application_manager/src/smart_object_keys.cc
@@ -312,6 +312,7 @@ const char* const resolution_width = "resolutionWidth";
 const char* const resolution_height = "resolutionHeight";
 const char* const max_bitrate = "maxBitrate";
 const char* const supported_formats = "supportedFormats";
+const char* const haptic_spatial_data_supported = "hapticSpatialDataSupported";
 }  // namespace strings
 
 namespace json {
diff --git a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
index 57cafd75e2..0a1e5d8ef7 100644
--- a/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
+++ b/src/components/application_manager/test/commands/hmi/ui_get_capabilities_response_test.cc
@@ -322,6 +322,8 @@ TEST_F(UIGetCapabilitiesResponseTest, SetVideoStreamingCapability_SUCCESS) {
   video_streaming_capability[strings::supported_formats][0][strings::codec] =
       hmi_apis::Common_VideoStreamingCodec::H264;
 
+  video_streaming_capability[strings::haptic_spatial_data_supported] = true;
+
   ResponseFromHMIPtr command(
       CreateCommand<UIGetCapabilitiesResponse>(command_msg));
 
diff --git a/src/components/application_manager/test/hmi_capabilities.json b/src/components/application_manager/test/hmi_capabilities.json
index 435d03c8bf..7c6cdd7dcd 100644
--- a/src/components/application_manager/test/hmi_capabilities.json
+++ b/src/components/application_manager/test/hmi_capabilities.json
@@ -316,7 +316,8 @@
                 {
                     "protocol": "RTP",
                     "codec": "Theora"
-                }]
+                }],
+                "hapticSpatialDataSupported": true
             }
         }
     },
@@ -442,4 +443,4 @@
         "majorVersion": 3,
         "minorVersion": 0
     }
-}
\ No newline at end of file
+}
diff --git a/src/components/application_manager/test/hmi_capabilities_test.cc b/src/components/application_manager/test/hmi_capabilities_test.cc
index bd3aa3e730..4ede705f87 100644
--- a/src/components/application_manager/test/hmi_capabilities_test.cc
+++ b/src/components/application_manager/test/hmi_capabilities_test.cc
@@ -419,6 +419,8 @@ TEST_F(HMICapabilitiesTest, LoadCapabilitiesFromFile) {
   EXPECT_EQ(
       2,
       vs_capability_so[strings::supported_formats][1][strings::codec].asInt());
+  EXPECT_TRUE(vs_capability_so.keyExists(strings::haptic_spatial_data_supported));
+  EXPECT_TRUE(vs_capability_so[strings::haptic_spatial_data_supported].asBool());
 }
 
 TEST_F(HMICapabilitiesTest, VerifyImageType) {
diff --git a/src/components/interfaces/HMI_API.xml b/src/components/interfaces/HMI_API.xml
index db20beb27f..19e36fc9cb 100644
--- a/src/components/interfaces/HMI_API.xml
+++ b/src/components/interfaces/HMI_API.xml
@@ -2256,6 +2256,9 @@
         Each object will contain a VideoStreamingFormat that describes what can be expected.
       </description>
     </param>
+    <param name="hapticSpatialDataSupported" type="Boolean" mandatory="false">
+      <description>True if the system can utilize the haptic spatial data from the source being streamed. </description>
+    </param>
   </struct>
 
   <struct name="SystemCapabilities">
diff --git a/src/components/interfaces/MOBILE_API.xml b/src/components/interfaces/MOBILE_API.xml
index 2488998d81..a7ded6299e 100644
--- a/src/components/interfaces/MOBILE_API.xml
+++ b/src/components/interfaces/MOBILE_API.xml
@@ -2548,6 +2548,9 @@
         Each object will contain a VideoStreamingFormat that describes what can be expected.

       </description>

     </param>

+    <param name="hapticSpatialDataSupported" type="Boolean" mandatory="false">

+      <description>True if the system can utilize the haptic spatial data from the source being streamed.</description>

+    </param>

   </struct>

 

   <struct name="SystemCapability">