viewer: return null params if not in array

Suppresses warning about input array sizes.
dalalsunil1986 · Apr 13, 2021 · 76eb117 · 76eb117
1 parent 46e00c0
commit 76eb117
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h
@@ -72,12 +72,24 @@ class ViewerOutput : public Node
 
   VideoParams GetVideoParams(int index = 0) const
   {
-    return GetStandardValue(kVideoParamsInput, index).value<VideoParams>();
+    // This check isn't strictly necessary (GetStandardValue will return a null VideoParams anyway),
+    // but it does suppress a warning message that we don't need
+    if (index < InputArraySize(kVideoParamsInput)) {
+      return GetStandardValue(kVideoParamsInput, index).value<VideoParams>();
+    } else {
+      return VideoParams();
+    }
   }
 
   AudioParams GetAudioParams(int index = 0) const
   {
-    return GetStandardValue(kAudioParamsInput, index).value<AudioParams>();
+    // This check isn't strictly necessary (GetStandardValue will return a null VideoParams anyway),
+    // but it does suppress a warning message that we don't need
+    if (index < InputArraySize(kAudioParamsInput)) {
+      return GetStandardValue(kAudioParamsInput, index).value<AudioParams>();
+    } else {
+      return AudioParams();
+    }
   }
 
   void SetVideoParams(const VideoParams &video, int index = 0)