Merge pull request #24 from Azure/user/pyeh/camera_adapter_fix

User/pyeh/camera adapter fix

pnpbridge/src/adapters/src/Camera/CameraIotPnpAPIs.cpp

@@ -169,7 +169,7 @@ CameraPnpInterfaceBind(
 
     RETURN_HR_IF (E_UNEXPECTED, 0 != PnpAdapterInterface_Create(&interfaceParams, &adapterInterface))
 
-    RETURN_IF_FAILED(pIotPnp->Initialize(PnpAdapterInterface_GetPnpInterfaceClient(adapterInterface), nullptr /* cameraName.c_str() */));
+    RETURN_IF_FAILED(pIotPnp->Initialize(PnpAdapterInterface_GetPnpInterfaceClient(adapterInterface), cameraName.c_str() ));
     RETURN_IF_FAILED (pIotPnp->StartTelemetryWorker());
 
     RETURN_HR_IF (E_UNEXPECTED, 0 != PnpAdapterInterface_SetContext(adapterInterface, (void*)pIotPnp.get()));

pnpbridge/src/adapters/src/Camera/CameraPnpDiscovery.cpp

@@ -86,10 +86,10 @@ CameraPnpDiscovery::InitializePnpDiscovery(
         PNPMESSAGE_PROPERTIES* props = NULL;
 
         RETURN_IF_FAILED (pjson->Initialize());
-        RETURN_IF_FAILED (pjson->AddFormatString("Identity", "camera-health-monitor"));
+        RETURN_IF_FAILED (pjson->AddFormatString("identity", "camera-health-monitor"));
         RETURN_IF_FAILED (pmatchjson->Initialize());
-        RETURN_IF_FAILED (pmatchjson->AddFormatString("HardwareId", "UVC_Webcam_00"));
-        RETURN_IF_FAILED (pjson->AddObject("MatchParameters", pmatchjson->GetMessageW()));
+        RETURN_IF_FAILED (pmatchjson->AddFormatString("hardware_id", "UVC_Webcam_00"));
+        RETURN_IF_FAILED (pjson->AddObject("match_parameters", pmatchjson->GetMessageW()));
 
         PnpMessage_CreateMessage(&payload);
         PnpMessage_SetMessage(payload, pjson->GetMessageW());

pnpbridge/src/adapters/src/Camera/CameraStatConsumer.cpp

@@ -34,6 +34,7 @@ CameraStatConsumer::CameraStatConsumer(
 ,   m_hFlushThread(nullptr)
 ,   m_fCoInit(false)
 ,   m_fMfStartup(false)
+,   m_stats({ 0 })
 {
     ZeroMemory(m_buffer, sizeof(m_buffer));
     ZeroMemory(&m_TraceLogfile, sizeof(m_TraceLogfile));