From 3c2fb6fa19733ad2a5ceacb88cfc6362eb83591f Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Thu, 1 Aug 2024 06:40:30 -0700
Subject: [PATCH] Upgrade Monte library (#1661)

---
 pom.xml                                               | 11 +++++------
 .../test/acceptance/recorder/JUnitScreenRecorder.java |  6 +++---
 .../test/acceptance/recorder/TestRecorderRule.java    |  8 ++++----
 .../META-INF/services/org.monte.media.av.CodecSpi     | 10 ++++++++++
 .../services/org.monte.media.av.MovieReaderSpi        |  2 ++
 .../services/org.monte.media.av.MovieWriterSpi        |  2 ++
 6 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 src/main/resources/META-INF/services/org.monte.media.av.CodecSpi
 create mode 100644 src/main/resources/META-INF/services/org.monte.media.av.MovieReaderSpi
 create mode 100644 src/main/resources/META-INF/services/org.monte.media.av.MovieWriterSpi

diff --git a/pom.xml b/pom.xml
index 9ec43da981..c24ffff571 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,6 @@
     <maven.version>3.8.1</maven.version>
     <maven-resolver.version>1.6.2</maven-resolver.version>
     <groovy.version>3.0.22</groovy.version>
-    <monte.version>0.7.7.0</monte.version>
     <slf4j.version>2.0.13</slf4j.version>
     <jffi.version>1.3.13</jffi.version>
   </properties>
@@ -65,6 +64,11 @@
       <artifactId>args4j</artifactId>
       <version>2.37</version>
     </dependency>
+    <dependency>
+      <groupId>ch.randelshofer</groupId>
+      <artifactId>org.monte.media.screenrecorder</artifactId>
+      <version>17.1</version>
+    </dependency>
     <dependency>
       <groupId>com.browserup</groupId>
       <artifactId>browserup-proxy-core</artifactId>
@@ -121,11 +125,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <dependency>
-      <groupId>com.github.stephenc.monte</groupId>
-      <artifactId>monte-screen-recorder</artifactId>
-      <version>${monte.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
diff --git a/src/main/java/org/jenkinsci/test/acceptance/recorder/JUnitScreenRecorder.java b/src/main/java/org/jenkinsci/test/acceptance/recorder/JUnitScreenRecorder.java
index 59be5bb2dc..ff8f96cb87 100644
--- a/src/main/java/org/jenkinsci/test/acceptance/recorder/JUnitScreenRecorder.java
+++ b/src/main/java/org/jenkinsci/test/acceptance/recorder/JUnitScreenRecorder.java
@@ -6,9 +6,9 @@
 import java.io.File;
 import java.io.IOException;
 import org.jenkinsci.test.acceptance.junit.FailureDiagnostics;
-import org.monte.media.Format;
-import org.monte.media.Registry;
-import org.monte.screenrecorder.ScreenRecorder;
+import org.monte.media.av.Format;
+import org.monte.media.av.Registry;
+import org.monte.media.screenrecorder.ScreenRecorder;
 
 /**
  * Custom Screen Recorder that allow to rename video output file.
diff --git a/src/main/java/org/jenkinsci/test/acceptance/recorder/TestRecorderRule.java b/src/main/java/org/jenkinsci/test/acceptance/recorder/TestRecorderRule.java
index 12b039d8a8..1b542bee47 100644
--- a/src/main/java/org/jenkinsci/test/acceptance/recorder/TestRecorderRule.java
+++ b/src/main/java/org/jenkinsci/test/acceptance/recorder/TestRecorderRule.java
@@ -15,11 +15,11 @@
 import org.jenkinsci.test.acceptance.utils.SystemEnvironmentVariables;
 import org.junit.rules.TestWatcher;
 import org.junit.runner.Description;
-import org.monte.media.Format;
-import org.monte.media.FormatKeys;
-import org.monte.media.VideoFormatKeys;
+import org.monte.media.av.Format;
+import org.monte.media.av.FormatKeys;
+import org.monte.media.av.codec.video.VideoFormatKeys;
 import org.monte.media.math.Rational;
-import org.monte.screenrecorder.ScreenRecorder;
+import org.monte.media.screenrecorder.ScreenRecorder;
 
 /**
  * JUnit Rule that before executing a test it starts a recording current screen
diff --git a/src/main/resources/META-INF/services/org.monte.media.av.CodecSpi b/src/main/resources/META-INF/services/org.monte.media.av.CodecSpi
new file mode 100644
index 0000000000..cd2e3ed92c
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.monte.media.av.CodecSpi
@@ -0,0 +1,10 @@
+org.monte.media.av.codec.video.JPEGCodecSpi
+org.monte.media.av.codec.video.PNGCodecSpi
+org.monte.media.av.codec.video.TechSmithCodecSpi
+org.monte.media.avi.codec.audio.AVIPCMAudioCodecSpi
+org.monte.media.avi.codec.video.DIBCodecSpi
+org.monte.media.avi.codec.video.RunLengthCodecSpi
+org.monte.media.avi.codec.video.ZMBVCodecSpi
+org.monte.media.quicktime.codec.audio.QuickTimePCMAudioCodecSpi
+org.monte.media.quicktime.codec.video.AnimationCodecSpi
+org.monte.media.quicktime.codec.video.RawCodecSpi
diff --git a/src/main/resources/META-INF/services/org.monte.media.av.MovieReaderSpi b/src/main/resources/META-INF/services/org.monte.media.av.MovieReaderSpi
new file mode 100644
index 0000000000..3ceddd979c
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.monte.media.av.MovieReaderSpi
@@ -0,0 +1,2 @@
+org.monte.media.avi.AVIReaderSpi
+org.monte.media.quicktime.QuickTimeReaderSpi
diff --git a/src/main/resources/META-INF/services/org.monte.media.av.MovieWriterSpi b/src/main/resources/META-INF/services/org.monte.media.av.MovieWriterSpi
new file mode 100644
index 0000000000..38474e43f3
--- /dev/null
+++ b/src/main/resources/META-INF/services/org.monte.media.av.MovieWriterSpi
@@ -0,0 +1,2 @@
+org.monte.media.avi.AVIWriterSpi
+org.monte.media.quicktime.QuickTimeWriterSpi