# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1580800942 -3600
# Node ID e168a2dedb00585917cd566e6a2d79c4921f79fe
# Parent  fddf3fc82362887c6977b3eb4b5c345ccc53337c# Parent  fa3ff492fb3b1dd59a2ed4c45263317ba16236dc
integration mainline->storage-commitment

diff -r fddf3fc82362 -r e168a2dedb00 Core/Enumerations.cpp
--- a/Core/Enumerations.cpp	Fri Jan 31 17:15:56 2020 +0100
+++ b/Core/Enumerations.cpp	Tue Feb 04 08:22:22 2020 +0100
@@ -899,6 +899,9 @@
       case TransferSyntax_Mpeg2:
         return "MPEG2";
 
+      case TransferSyntax_Mpeg4:
+        return "MPEG4";
+
       case TransferSyntax_Rle:
         return "RLE";
 
diff -r fddf3fc82362 -r e168a2dedb00 Core/Enumerations.h
--- a/Core/Enumerations.h	Fri Jan 31 17:15:56 2020 +0100
+++ b/Core/Enumerations.h	Tue Feb 04 08:22:22 2020 +0100
@@ -636,6 +636,7 @@
     TransferSyntax_JpegLossless,
     TransferSyntax_Jpip,
     TransferSyntax_Mpeg2,
+    TransferSyntax_Mpeg4,  // New in Orthanc 1.6.0
     TransferSyntax_Rle
   };
 
diff -r fddf3fc82362 -r e168a2dedb00 OrthancServer/main.cpp
--- a/OrthancServer/main.cpp	Fri Jan 31 17:15:56 2020 +0100
+++ b/OrthancServer/main.cpp	Tue Feb 04 08:22:22 2020 +0100
@@ -341,6 +341,10 @@
         configuration = "Mpeg2TransferSyntaxAccepted";
         break;
 
+      case TransferSyntax_Mpeg4:
+        configuration = "Mpeg4TransferSyntaxAccepted";
+        break;
+
       case TransferSyntax_Rle:
         configuration = "RleTransferSyntaxAccepted";
         break;
diff -r fddf3fc82362 -r e168a2dedb00 Resources/Configuration.json
--- a/Resources/Configuration.json	Fri Jan 31 17:15:56 2020 +0100
+++ b/Resources/Configuration.json	Tue Feb 04 08:22:22 2020 +0100
@@ -124,6 +124,7 @@
   "JpipTransferSyntaxAccepted"         : true,
   "Mpeg2TransferSyntaxAccepted"        : true,
   "RleTransferSyntaxAccepted"          : true,
+  "Mpeg4TransferSyntaxAccepted"        : true,  // New in Orthanc 1.6.0
 
   // Whether Orthanc accepts to act as C-Store SCP for unknown storage
   // SOP classes (aka. "promiscuous mode")
diff -r fddf3fc82362 -r e168a2dedb00 Resources/Samples/Lua/TransferSyntaxDisable.lua
--- a/Resources/Samples/Lua/TransferSyntaxDisable.lua	Fri Jan 31 17:15:56 2020 +0100
+++ b/Resources/Samples/Lua/TransferSyntaxDisable.lua	Tue Feb 04 08:22:22 2020 +0100
@@ -22,6 +22,10 @@
    return false
 end
 
+function IsMpeg4TransferSyntaxAccepted(aet, ip)
+   return false
+end
+
 function IsRleTransferSyntaxAccepted(aet, ip)
    return false
 end
diff -r fddf3fc82362 -r e168a2dedb00 Resources/Samples/Lua/TransferSyntaxEnable.lua
--- a/Resources/Samples/Lua/TransferSyntaxEnable.lua	Fri Jan 31 17:15:56 2020 +0100
+++ b/Resources/Samples/Lua/TransferSyntaxEnable.lua	Tue Feb 04 08:22:22 2020 +0100
@@ -22,6 +22,10 @@
    return true
 end
 
+function IsMpeg4TransferSyntaxAccepted(aet, ip)
+   return true
+end
+
 function IsRleTransferSyntaxAccepted(aet, ip)
    return true
 end