Merge branch 'ffmpeg_griffin' into 'master'

FFMPEG griffin See merge request vitam/vitam-griffins!60
ProgrammeVitam · Oct 3, 2019 · dca8030 · dca8030
2 parents e746652 + 290b865
commit dca8030
Show file tree

Hide file tree

Showing 57 changed files with 2,382 additions and 390 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,4 @@ obj/
 **/.classpath
 **/.project
 **/.vscode
-
+**/.encoding
diff --git a/common/pom.xml b/common/pom.xml
@@ -13,33 +13,10 @@
     <artifactId>common</artifactId>
     <name>Vitam griffins common</name>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-    </dependencies>
-
     <build>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
-                <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
-                </configuration>
             </plugin>
         </plugins>
     </build>

diff --git a/cookbook/griffin_referential/griffin-ffmpeg.json b/cookbook/griffin_referential/griffin-ffmpeg.json
@@ -0,0 +1,11 @@
+[
+    {
+      "Identifier": "GRI-000007",
+      "Name": "Griffon FFMPEG",
+      "Description": "A ffmpeg griffin",
+      "CreationDate": "2019-07-30T15:55:30.721",
+      "LastUpdate": "2019-07-30T16:34:21.542",
+      "ExecutableName": "ffmpeg-griffin",
+      "ExecutableVersion": "V1.0.0"
+    }
+  ]
diff --git a/cookbook/griffin_referential/griffin-verapdf.json b/cookbook/griffin_referential/griffin-verapdf.json
@@ -0,0 +1,11 @@
+[
+    {
+      "Identifier": "GRI-000008",
+      "Name": "Griffon veraPDF",
+      "Description": "A verapdf griffin",
+      "CreationDate": "2019-07-30T15:55:30.721",
+      "LastUpdate": "2019-07-30T16:34:21.542",
+      "ExecutableName": "verapdf-griffin",
+      "ExecutableVersion": "V1.0.0"
+    }
+  ]
diff --git a/cookbook/griffins-imagemagick.json → ...fin_referential/griffins-imagemagick.json b/cookbook/griffins-imagemagick.json → ...fin_referential/griffins-imagemagick.json
diff --git a/cookbook/griffins-jhove.json → ...k/griffin_referential/griffins-jhove.json b/cookbook/griffins-jhove.json → ...k/griffin_referential/griffins-jhove.json
diff --git a/cookbook/griffins-libreoffice.json → ...fin_referential/griffins-libreoffice.json b/cookbook/griffins-libreoffice.json → ...fin_referential/griffins-libreoffice.json
@@ -1,6 +1,6 @@
 [
   {
-    "Identifier": "GRI-000001",
+    "Identifier": "GRI-000002",
     "Name": "Griffon Libreoffice",
     "Description": "A libreoffice griffin",
     "CreationDate": "2018-11-16T15:55:30.721",

diff --git a/cookbook/griffins-odfvalidator.json → ...in_referential/griffins-odfvalidator.json b/cookbook/griffins-odfvalidator.json → ...in_referential/griffins-odfvalidator.json
@@ -1,6 +1,6 @@
 [
   {
-    "Identifier": "GRI-000005",
+    "Identifier": "GRI-000006",
     "Name": "Griffon Odfvalidator",
     "Description": "A jhove griffin",
     "CreationDate": "2018-11-16T15:55:30.721",

diff --git a/cookbook/griffins-siegfried.json → ...iffin_referential/griffins-siegfried.json b/cookbook/griffins-siegfried.json → ...iffin_referential/griffins-siegfried.json
@@ -1,6 +1,6 @@
 [
   {
-    "Identifier": "GRI-000001",
+    "Identifier": "GRI-000003",
     "Name": "Griffon siegfried",
     "Description": "A siegfried griffin",
     "CreationDate": "2018-11-16T15:55:30.721",

diff --git a/cookbook/griffins-tesseract.json → ...iffin_referential/griffins-tesseract.json b/cookbook/griffins-tesseract.json → ...iffin_referential/griffins-tesseract.json
diff --git a/cookbook/preservation-analyse-jhove.json → ...ferential/preservation-analyse-jhove.json b/cookbook/preservation-analyse-jhove.json → ...ferential/preservation-analyse-jhove.json
diff --git a/...ok/preservation-analyse-odfvalidator.json → ...al/preservation-analyse-odfvalidator.json b/...ok/preservation-analyse-odfvalidator.json → ...al/preservation-analyse-odfvalidator.json
@@ -30,7 +30,7 @@
           "fmt/291",
           "fmt/567"
         ],
-        "GriffinIdentifier": "GRI-000005",
+        "GriffinIdentifier": "GRI-000006",
         "Timeout": 20,
         "MaxSize": 10000000,
         "Debug": true,

diff --git a/cookbook/preservation-analyse-verapdf.json → ...rential/preservation-analyse-verapdf.json b/cookbook/preservation-analyse-verapdf.json → ...rential/preservation-analyse-verapdf.json
@@ -23,7 +23,7 @@
       }
     ],
     "DefaultGriffin": {
-      "GriffinIdentifier": "GRI-000002",
+      "GriffinIdentifier": "GRI-000008",
       "Timeout": 10,
       "MaxSize": 10000000,
       "Debug":true,

diff --git a/...n-metadata-technique-on-object-group.json → ...n-metadata-technique-on-object-group.json b/...n-metadata-technique-on-object-group.json → ...n-metadata-technique-on-object-group.json
diff --git a/...ok/preservation-generate-libreoffice.json → ...al/preservation-generate-libreoffice.json b/...ok/preservation-generate-libreoffice.json → ...al/preservation-generate-libreoffice.json
@@ -12,7 +12,7 @@
     "GriffinByFormat": [
       {
         "FormatList": ["fmt/45", "fmt/291"],
-        "GriffinIdentifier": "GRI-000001",
+        "GriffinIdentifier": "GRI-000002",
         "Timeout": 20,
         "MaxSize": 10000000,
         "Debug":true,

diff --git a/...book/preservation-generate-tesseract.json → ...tial/preservation-generate-tesseract.json b/...book/preservation-generate-tesseract.json → ...tial/preservation-generate-tesseract.json
diff --git a/cookbook/preservation-identification.json → ...erential/preservation-identification.json b/cookbook/preservation-identification.json → ...erential/preservation-identification.json
@@ -12,7 +12,7 @@
     "GriffinByFormat": [
       {
         "FormatList": ["x-fmt/3"],
-        "GriffinIdentifier": "GRI-000001",
+        "GriffinIdentifier": "GRI-000003",
         "Timeout": 20,
         "MaxSize": 10000000,
         "Debug":true,
@@ -25,7 +25,7 @@
       }
     ],
     "DefaultGriffin": {
-      "GriffinIdentifier": "GRI-000001",
+      "GriffinIdentifier": "GRI-000003",
       "Timeout": 20,
       "MaxSize": 10000000,
       "Debug": true,

diff --git a/...book/preservation-tranformation-webp.json → ...tial/preservation-tranformation-webp.json b/...book/preservation-tranformation-webp.json → ...tial/preservation-tranformation-webp.json
diff --git a/cookbook/preservation_referential/preservation_transformation_mp3.json b/cookbook/preservation_referential/preservation_transformation_mp3.json
@@ -0,0 +1,33 @@
+[
+    {
+      "Identifier": "PSC-000013",
+      "Name": "Tranformation en MP3",
+      "Description": "Ce scenario transforme un fichier audio WMA en MP3",
+      "CreationDate": "2018-11-16T15:55:30.721",
+      "LastUpdate": "2018-11-20T15:34:21.542",
+      "ActionList": [
+        "GENERATE"
+      ],
+      "MetadataFilter": null,
+      "GriffinByFormat": [
+        {
+          "FormatList": ["fmt/132"],
+          "GriffinIdentifier": "GRI-000007",
+          "Timeout": 200,
+          "MaxSize": 10000000,
+          "Debug":true,
+          "ActionDetail": [
+            {
+              "Type": "GENERATE",
+              "Values": {
+                "Extension": "MP3",
+                "Args": ["-codec:a", "libmp3lame"]
+              }
+            }
+          ]
+        }
+      ],
+      "DefaultGriffin": null
+    }
+  ]
+
diff --git a/cookbook/preservation_referential/preservation_transformation_mp4v.json b/cookbook/preservation_referential/preservation_transformation_mp4v.json
@@ -0,0 +1,33 @@
+[
+    {
+      "Identifier": "PSC-000014",
+      "Name": "Tranformation en MP4",
+      "Description": "Ce scenario transforme un fichier vidéo  MP4",
+      "CreationDate": "2018-11-16T15:55:30.721",
+      "LastUpdate": "2018-11-20T15:34:21.542",
+      "ActionList": [
+        "GENERATE"
+      ],
+      "MetadataFilter": null,
+      "GriffinByFormat": [
+        {
+          "FormatList": ["fmt/199"],
+          "GriffinIdentifier": "GRI-000007",
+          "Timeout": 20,
+          "MaxSize": 100000000,
+          "Debug":true,
+          "ActionDetail": [
+            {
+              "Type": "GENERATE",
+              "Values": {
+                "Extension": "MP4",
+                "Args": ["-codec:v", "libx264", "-preset", "superfast", "-crf", "99", "-profile:v", "baseline", "-level", "3.0", "-acodec", "libfdk_aac"]
+              }
+            }
+          ]
+        }
+      ],
+      "DefaultGriffin": null
+    }
+  ]
+
diff --git a/cookbook/preservation_referential/preservation_transformation_mp4v_debian.json b/cookbook/preservation_referential/preservation_transformation_mp4v_debian.json
@@ -0,0 +1,33 @@
+[
+    {
+      "Identifier": "PSC-000014",
+      "Name": "Tranformation en MP4",
+      "Description": "Ce scenario transforme un fichier vidéo  MP4",
+      "CreationDate": "2018-11-16T15:55:30.721",
+      "LastUpdate": "2018-11-20T15:34:21.542",
+      "ActionList": [
+        "GENERATE"
+      ],
+      "MetadataFilter": null,
+      "GriffinByFormat": [
+        {
+          "FormatList": ["fmt/199"],
+          "GriffinIdentifier": "GRI-000007",
+          "Timeout": 20,
+          "MaxSize": 100000000,
+          "Debug":true,
+          "ActionDetail": [
+            {
+              "Type": "GENERATE",
+              "Values": {
+                "Extension": "MP4",
+                "Args": ["-codec:v", "libx264", "-preset", "superfast", "-crf", "99", "-profile:v", "baseline", "-level", "3.0", "-acodec", "aac"]
+              }
+            }
+          ]
+        }
+      ],
+      "DefaultGriffin": null
+    }
+  ]
+
diff --git a/cookbook/preservation_referential/preservation_transformation_video_vignette.json b/cookbook/preservation_referential/preservation_transformation_video_vignette.json
@@ -0,0 +1,33 @@
+[
+    {
+      "Identifier": "PSC-000015",
+      "Name": "Tranformation vidéo en vignette",
+      "Description": "Ce scenario transforme un fichier vidéo en vignette PNG",
+      "CreationDate": "2018-11-16T15:55:30.721",
+      "LastUpdate": "2018-11-20T15:34:21.542",
+      "ActionList": [
+        "GENERATE"
+      ],
+      "MetadataFilter": null,
+      "GriffinByFormat": [
+        {
+          "FormatList": ["fmt/199"],
+          "GriffinIdentifier": "GRI-000007",
+          "Timeout": 20,
+          "MaxSize": 100000000,
+          "Debug":true,
+          "ActionDetail": [
+            {
+              "Type": "GENERATE",
+              "Values": {
+                "Extension": "PNG",
+                "Args": ["-vf", "thumbnail,scale=640:480", "-frames:v", "1"]
+              }
+            }
+          ]
+        }
+      ],
+      "DefaultGriffin": null
+    }
+  ]
+
diff --git a/cookbook/sip_images.zip → cookbook/sip_test/sip_images.zip b/cookbook/sip_images.zip → cookbook/sip_test/sip_images.zip
diff --git a/cookbook/sip_images_webp.zip → cookbook/sip_test/sip_images_webp.zip b/cookbook/sip_images_webp.zip → cookbook/sip_test/sip_images_webp.zip
diff --git a/cookbook/sip_libreoffice.zip → cookbook/sip_test/sip_libreoffice.zip b/cookbook/sip_libreoffice.zip → cookbook/sip_test/sip_libreoffice.zip
diff --git a/cookbook/sip_tesseract.zip → cookbook/sip_test/sip_tesseract.zip b/cookbook/sip_tesseract.zip → cookbook/sip_test/sip_tesseract.zip
diff --git a/ffmpeg/griffin b/ffmpeg/griffin
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+java -Dfile.encoding=UTF-8 -jar /vitam/bin/worker/griffins/ffmpeg-griffin/ffmpeg-jar-with-dependencies.jar $1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		java -Dfile.encoding=UTF-8 -jar /vitam/bin/worker/griffins/ffmpeg-griffin/ffmpeg-jar-with-dependencies.jar $1