Add ResourceExhausted error return for StreamAllocate functions.

Author: pidarped

examples/camera-app/camera-common/include/camera-device-interface.h

@@ -43,6 +43,7 @@ enum class CameraError
   ERROR_SNAPSHOT_STREAM_STOP_FAILED,
   ERROR_CAPTURE_SNAPSHOT_FAILED,
   ERROR_CONFIG_FAILED,
+  ERROR_RESOURCE_EXHAUSTED,
   ERROR_NOT_IMPLEMENTED, // For features not supported on a platform
 };
 

examples/camera-app/linux/src/camera-device.cpp

@@ -82,17 +82,29 @@ CameraError CameraDevice::InitializeStreams()
 
 CameraError CameraDevice::VideoStreamAllocate(const VideoStreamStruct & allocateArgs, uint16_t & outStreamID)
 {
+    outStreamID               = kInvalidStreamID;
+    bool foundAvailableStream = false;
+
     for (VideoStream & stream : videoStreams)
     {
-        // Fake allocation with just matching codec
-        if (!stream.isAllocated && stream.codec == allocateArgs.videoCodec)
+        if (!stream.isAllocated)
         {
-            stream.isAllocated = true;
-            outStreamID        = stream.id;
-            return CameraError::SUCCESS;
+            foundAvailableStream = true;
+
+            if (stream.codec == allocateArgs.videoCodec)
+            {
+                stream.isAllocated = true;
+                outStreamID        = stream.id;
+                return CameraError::SUCCESS;
+            }
         }
     }
 
+    if (!foundAvailableStream)
+    {
+        return CameraError::ERROR_RESOURCE_EXHAUSTED;
+    }
+
     return CameraError::ERROR_VIDEO_STREAM_ALLOC_FAILED;
 }
 
@@ -112,17 +124,30 @@ CameraError CameraDevice::VideoStreamDeallocate(const uint16_t streamID)
 
 CameraError CameraDevice::AudioStreamAllocate(const AudioStreamStruct & allocateArgs, uint16_t & outStreamID)
 {
+    outStreamID = kInvalidStreamID;
+
+    bool foundAvailableStream = false;
+
     for (AudioStream & stream : audioStreams)
     {
-        // TODO: Match more params
-        if (!stream.isAllocated && stream.codec == allocateArgs.audioCodec)
+        if (!stream.isAllocated)
         {
-            stream.isAllocated = true;
-            outStreamID        = stream.id;
-            return CameraError::SUCCESS;
+            foundAvailableStream = true;
+
+            if (stream.codec == allocateArgs.audioCodec)
+            {
+                stream.isAllocated = true;
+                outStreamID        = stream.id;
+                return CameraError::SUCCESS;
+            }
         }
     }
 
+    if (!foundAvailableStream)
+    {
+        return CameraError::ERROR_RESOURCE_EXHAUSTED;
+    }
+
     return CameraError::ERROR_AUDIO_STREAM_ALLOC_FAILED;
 }
 
@@ -142,17 +167,30 @@ CameraError CameraDevice::AudioStreamDeallocate(const uint16_t streamID)
 
 CameraError CameraDevice::SnapshotStreamAllocate(const SnapshotStreamStruct & allocateArgs, uint16_t & outStreamID)
 {
+    outStreamID = kInvalidStreamID;
+
+    bool foundAvailableStream = false;
+
     for (SnapshotStream & stream : snapshotStreams)
     {
-        // TODO: Match more params
-        if (!stream.isAllocated && stream.codec == allocateArgs.imageCodec)
+        if (!stream.isAllocated)
         {
-            stream.isAllocated = true;
-            outStreamID        = stream.id;
-            return CameraError::SUCCESS;
+            foundAvailableStream = true;
+
+            if (stream.codec == allocateArgs.imageCodec)
+            {
+                stream.isAllocated = true;
+                outStreamID        = stream.id;
+                return CameraError::SUCCESS;
+            }
         }
     }
 
+    if (!foundAvailableStream)
+    {
+        return CameraError::ERROR_RESOURCE_EXHAUSTED;
+    }
+
     return CameraError::ERROR_SNAPSHOT_STREAM_ALLOC_FAILED;
 }
 

examples/camera-app/linux/src/clusters/camera-avstream-mgmt/camera-av-stream-manager.cpp

@@ -43,13 +43,15 @@ Protocols::InteractionModel::Status CameraAVStreamManager::VideoStreamAllocate(c
 {
     outStreamID = kInvalidStreamID;
 
-    if (CameraDevice::GetInstance().VideoStreamAllocate(allocateArgs, outStreamID) == CameraError::SUCCESS)
+    CameraError error = CameraDevice::GetInstance().VideoStreamAllocate(allocateArgs, outStreamID);
+    switch (error)
     {
-        return Status::Success;
-    }
-    else
-    {
-        return Status::Failure;
+    case CameraError::SUCCESS:
+      return Status::Success;
+    case CameraError::ERROR_RESOURCE_EXHAUSTED:
+      return Status::ResourceExhausted;
+    default:
+      return Status::Failure;
     }
 }
 
@@ -83,13 +85,15 @@ Protocols::InteractionModel::Status CameraAVStreamManager::AudioStreamAllocate(c
 {
     outStreamID = kInvalidStreamID;
 
-    if (CameraDevice::GetInstance().AudioStreamAllocate(allocateArgs, outStreamID) == CameraError::SUCCESS)
+    CameraError error = CameraDevice::GetInstance().AudioStreamAllocate(allocateArgs, outStreamID);
+    switch (error)
     {
-        return Status::Success;
-    }
-    else
-    {
-        return Status::Failure;
+    case CameraError::SUCCESS:
+      return Status::Success;
+    case CameraError::ERROR_RESOURCE_EXHAUSTED:
+      return Status::ResourceExhausted;
+    default:
+      return Status::Failure;
     }
 }
 
@@ -105,13 +109,15 @@ Protocols::InteractionModel::Status CameraAVStreamManager::SnapshotStreamAllocat
 {
     outStreamID = kInvalidStreamID;
 
-    if (CameraDevice::GetInstance().SnapshotStreamAllocate(allocateArgs, outStreamID) == CameraError::SUCCESS)
-    {
-        return Status::Success;
-    }
-    else
+    CameraError error = CameraDevice::GetInstance().SnapshotStreamAllocate(allocateArgs, outStreamID);
+    switch (error)
     {
-        return Status::Failure;
+    case CameraError::SUCCESS:
+      return Status::Success;
+    case CameraError::ERROR_RESOURCE_EXHAUSTED:
+      return Status::ResourceExhausted;
+    default:
+      return Status::Failure;
     }
 }