changeset 3644:e168a2dedb00 storage-commitment

integration mainline->storage-commitment
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Feb 2020 08:22:22 +0100
parents fddf3fc82362 (current diff) fa3ff492fb3b (diff)
children 5faf76511931
files Core/Enumerations.cpp Core/Enumerations.h OrthancServer/main.cpp Resources/Configuration.json
diffstat 6 files changed, 17 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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";
 
--- 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
   };
 
--- 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;
--- 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")
--- 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
--- 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