Build fixes

Author: sharadb-amazon

examples/tv-casting-app/darwin/MatterTvCastingBridge/MatterTvCastingBridge/CastingServerBridge.mm

@@ -317,8 +317,8 @@ - (void)readCachedVideoPlayers:(dispatch_queue_t _Nonnull)clientQueue
             videoPlayers = [NSMutableArray new];
             for (size_t i = 0; cppTargetVideoPlayerInfos[i].IsInitialized(); i++) {
                 ChipLogProgress(AppServer,
-                    "CastingServerBridge().readCachedVideoPlayers() with nodeId: %lu fabricIndex: %d deviceName: %s vendorId: %d",
-                    cppTargetVideoPlayerInfos[i].GetNodeId(), cppTargetVideoPlayerInfos[i].GetFabricIndex(),
+                    "CastingServerBridge().readCachedVideoPlayers() with nodeId: 0x" ChipLogFormatX64 " fabricIndex: %d deviceName: %s vendorId: %d",
+                    ChipLogValueX64(cppTargetVideoPlayerInfos[i].GetNodeId()), cppTargetVideoPlayerInfos[i].GetFabricIndex(),
                     cppTargetVideoPlayerInfos[i].GetDeviceName(), cppTargetVideoPlayerInfos[i].GetVendorId());
                 videoPlayers[i] = [ConversionUtils convertToObjCVideoPlayerFrom:&cppTargetVideoPlayerInfos[i]];
             }

examples/tv-casting-app/linux/CastingUtils.cpp

@@ -210,9 +210,9 @@ void doCastingDemoActions(TargetEndpointInfo * endpoint)
 void OnConnectionSuccess(TargetVideoPlayerInfo * videoPlayer)
 {
     ChipLogProgress(AppServer,
-                    "OnConnectionSuccess with Video Player(nodeId: %lu, fabricIndex: %d, deviceName: %s, vendorId: %d, productId: "
+                    "OnConnectionSuccess with Video Player(nodeId: 0x" ChipLogFormatX64 ", fabricIndex: %d, deviceName: %s, vendorId: %d, productId: "
                     "%d, deviceType: %d)",
-                    videoPlayer->GetNodeId(), videoPlayer->GetFabricIndex(), videoPlayer->GetDeviceName(),
+                    ChipLogValueX64(videoPlayer->GetNodeId()), videoPlayer->GetFabricIndex(), videoPlayer->GetDeviceName(),
                     videoPlayer->GetVendorId(), videoPlayer->GetProductId(), videoPlayer->GetDeviceType());
 
     TargetEndpointInfo * endpoints = videoPlayer->GetEndpoints();
@@ -245,15 +245,15 @@ CHIP_ERROR ConnectToCachedVideoPlayer()
         {
             if (cachedVideoPlayers[i].IsInitialized())
             {
-                ChipLogProgress(AppServer, "Found a Cached video player with nodeId: %lu, fabricIndex: %d",
-                                cachedVideoPlayers[i].GetNodeId(), cachedVideoPlayers[i].GetFabricIndex());
+                ChipLogProgress(AppServer, "Found a Cached video player with nodeId: 0x" ChipLogFormatX64 ", fabricIndex: %d",
+                                ChipLogValueX64(cachedVideoPlayers[i].GetNodeId()), cachedVideoPlayers[i].GetFabricIndex());
                 if (CastingServer::GetInstance()->VerifyOrEstablishConnection(
                         cachedVideoPlayers[i], OnConnectionSuccess, OnConnectionFailure, OnNewOrUpdatedEndpoint) == CHIP_NO_ERROR)
                 {
                     ChipLogProgress(
                         AppServer,
-                        "FindOrEstablish CASESession attempted for cached video player with nodeId: %lu, fabricIndex: %d",
-                        cachedVideoPlayers[i].GetNodeId(), cachedVideoPlayers[i].GetFabricIndex());
+                        "FindOrEstablish CASESession attempted for cached video player with nodeId: 0x" ChipLogFormatX64 ", fabricIndex: %d",
+                        ChipLogValueX64(cachedVideoPlayers[i].GetNodeId()), cachedVideoPlayers[i].GetFabricIndex());
                     return CHIP_NO_ERROR;
                 }
             }

examples/tv-casting-app/tv-casting-common/include/CastingServer.h

@@ -65,12 +65,8 @@ class CastingServer
     CHIP_ERROR SendUserDirectedCommissioningRequest(chip::Dnssd::DiscoveredNodeData * selectedCommissioner);
 #endif // CHIP_DEVICE_CONFIG_ENABLE_COMMISSIONER_DISCOVERY_CLIENT
 
-    TargetVideoPlayerInfo * GetActiveTargetVideoPlayer()
-    {
-        return mActiveTargetVideoPlayerInfo.IsInitialized() && mActiveTargetVideoPlayerInfo.GetOperationalDeviceProxy() != nullptr
-            ? &mActiveTargetVideoPlayerInfo
-            : nullptr;
-    }
+    TargetVideoPlayerInfo * GetActiveTargetVideoPlayer() { return &mActiveTargetVideoPlayerInfo; }
+
     CHIP_ERROR TargetVideoPlayerInfoInit(chip::NodeId nodeId, chip::FabricIndex fabricIndex,
                                          std::function<void(TargetVideoPlayerInfo *)> onConnectionSuccess,
                                          std::function<void(CHIP_ERROR)> onConnectionFailure,

examples/tv-casting-app/tv-casting-common/include/MediaBase.h

@@ -31,8 +31,8 @@ class MediaBase
         auto deviceProxy = targetVideoPlayerInfo.GetOperationalDeviceProxy();
         if (deviceProxy == nullptr)
         {
-            ChipLogError(AppServer, "Failed in getting an instance of OperationalDeviceProxy for nodeId: %lu, fabricIndex: %d",
-                         targetVideoPlayerInfo.GetNodeId(), targetVideoPlayerInfo.GetFabricIndex());
+            ChipLogError(AppServer, "Failed in getting an instance of OperationalDeviceProxy for nodeId: 0x" ChipLogFormatX64 ", fabricIndex: %d",
+                         ChipLogValueX64(targetVideoPlayerInfo.GetNodeId()), targetVideoPlayerInfo.GetFabricIndex());
             return CHIP_ERROR_PEER_NODE_NOT_FOUND;
         }
         mTargetVideoPlayerInfo = &targetVideoPlayerInfo;

examples/tv-casting-app/tv-casting-common/include/TargetVideoPlayerInfo.h

@@ -73,8 +73,8 @@ class TargetVideoPlayerInfo
         _this->mDeviceProxy           = chip::OperationalDeviceProxy(&exchangeMgr, sessionHandle);
         _this->mInitialized           = true;
         ChipLogProgress(AppServer,
-                        "HandleDeviceConnected created an instance of OperationalDeviceProxy for nodeId: %lu, fabricIndex: %d",
-                        _this->GetNodeId(), _this->GetFabricIndex());
+                        "HandleDeviceConnected created an instance of OperationalDeviceProxy for nodeId: 0x" ChipLogFormatX64 ", fabricIndex: %d",
+                        ChipLogValueX64(_this->GetNodeId()), _this->GetFabricIndex());
 
         if (_this->mOnConnectionSuccessClientCallback)
         {
@@ -87,8 +87,8 @@ class TargetVideoPlayerInfo
     {
         ChipLogError(
             AppServer,
-            "HandleDeviceConnectionFailure called for peerId.nodeId: %lu, peer.fabricIndex: %d with error: %" CHIP_ERROR_FORMAT,
-            peerId.GetNodeId(), peerId.GetFabricIndex(), error.AsString());
+            "HandleDeviceConnectionFailure called for peerId.nodeId: 0x" ChipLogFormatX64 ", peer.fabricIndex: %d with error: %" CHIP_ERROR_FORMAT,
+            ChipLogValueX64(peerId.GetNodeId()), peerId.GetFabricIndex(), error.AsString());
         TargetVideoPlayerInfo * _this = static_cast<TargetVideoPlayerInfo *>(context);
         _this->mDeviceProxy           = chip::OperationalDeviceProxy();
         if (_this->mOnConnectionFailureClientCallback)

examples/tv-casting-app/tv-casting-common/src/CastingServer.cpp

@@ -255,7 +255,7 @@ CHIP_ERROR CastingServer::VerifyOrEstablishConnection(TargetVideoPlayerInfo & ta
     mOnNewOrUpdatedEndpoint            = onNewOrUpdatedEndpoint;
 
     return targetVideoPlayerInfo.FindOrEstablishCASESession(
-        [](TargetVideoPlayerInfo * targetVideoPlayerInfo) {
+        [](TargetVideoPlayerInfo * videoPlayer) {
             ChipLogProgress(AppServer, "CastingServer::OnConnectionSuccess lambda called");
             chip::OperationalDeviceProxy * prevDeviceProxy =
                 CastingServer::GetInstance()->mActiveTargetVideoPlayerInfo.GetOperationalDeviceProxy();
@@ -264,8 +264,8 @@ CHIP_ERROR CastingServer::VerifyOrEstablishConnection(TargetVideoPlayerInfo & ta
                 ChipLogProgress(AppServer, "CastingServer::OnConnectionSuccess lambda Disconnecting deviceProxy");
                 prevDeviceProxy->Disconnect();
             }
-            CastingServer::GetInstance()->mActiveTargetVideoPlayerInfo = *targetVideoPlayerInfo;
-            CastingServer::GetInstance()->mOnConnectionSuccessClientCallback(targetVideoPlayerInfo);
+            CastingServer::GetInstance()->mActiveTargetVideoPlayerInfo = *videoPlayer;
+            CastingServer::GetInstance()->mOnConnectionSuccessClientCallback(videoPlayer);
         },
         onConnectionFailure);
 }

examples/tv-casting-app/tv-casting-common/src/PersistenceManager.cpp

@@ -149,7 +149,7 @@ CHIP_ERROR PersistenceManager::ReadAllVideoPlayers(TargetVideoPlayerInfo outVide
     size_t castingDataSize = 0;
     ReturnErrorOnFailure(chip::DeviceLayer::PersistedStorage::KeyValueStoreMgr().Get(kCastingDataKey, castingData,
                                                                                      kCastingDataMaxBytes, &castingDataSize));
-    ChipLogProgress(AppServer, "PersistenceManager::ReadAllVideoPlayers Read TLV(CastingData) from KVS store with size: %zu bytes",
+    ChipLogProgress(AppServer, "PersistenceManager::ReadAllVideoPlayers Read TLV(CastingData) from KVS store with size: %lu bytes",
                     castingDataSize);
 
     TLV::TLVReader reader;