Merge branch 'chernyak/JVET-AF0201' into 'master'

JVET-AF0201: Incorporate decoder memory measurement

See merge request !547

source/App/DecoderApp/decmain.cpp

@@ -112,6 +112,14 @@ int main(int argc, char* argv[])
   }
 #endif
 
+  #if JVET_Z0150_MEMORY_USAGE_PRINT
+#ifdef __linux
+  int vm = getProcStatusValue("VmPeak:");
+  int rm = getProcStatusValue("VmHWM:");
+  printf("\nMemory Usage: VmPeak= %d KB ( %.1f GiB ),  VmHWM= %d KB ( %.1f GiB )\n", vm, (double)vm/(1024*1024), rm, (double)rm/(1024*1024));
+#endif
+#endif
+
   // ending time
   dResult = (double)(clock()-lBefore) / CLOCKS_PER_SEC;
   printf("\n Total Time: %12.3f sec.\n", dResult);

source/App/EncoderApp/encmain.cpp

@@ -77,33 +77,6 @@ static void printMacroSettings()
   }
 }
 
-#if JVET_Z0150_MEMORY_USAGE_PRINT
-#ifdef __linux
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-int getProcStatusValue(const char* key)
-{
-  FILE* file = fopen("/proc/self/status", "r");
-  int result = -1;
-  char line[128];
-
-  int len = strlen(key);
-  while (fgets(line, 128, file) != nullptr)
-  {
-    if (strncmp(line, key, len) == 0)
-    {
-      result = atoi(line+len);
-      break;
-    }
-  }
-  fclose(file);
-  return result;
-}
-#endif
-#endif
-
 // ====================================================================================================================
 // Main function
 // ====================================================================================================================

source/Lib/CommonLib/CommonDef.h

@@ -1817,6 +1817,29 @@ static inline uint32_t getIndexMappingTableToSortedArray1D(InputValueType (&in)[
 }
 #endif
 
+#if JVET_Z0150_MEMORY_USAGE_PRINT
+#ifdef __linux
+static inline int getProcStatusValue(const char* key)
+{
+  FILE* file = fopen("/proc/self/status", "r");
+  int result = -1;
+  char line[128];
+
+  int len = strlen(key);
+  while (fgets(line, 128, file) != nullptr)
+  {
+    if (strncmp(line, key, len) == 0)
+    {
+      result = atoi(line+len);
+      break;
+    }
+  }
+  fclose(file);
+  return result;
+}
+#endif
+#endif
+
 //CASE-BREAK for breakpoints
 #if defined ( _MSC_VER ) && defined ( _DEBUG )
 #define _CASE(_x) if(_x)