* Upgrade dependencies for FFmpeg 5.0

bytedeco · Jan 19, 2022 · ead9d72 · ead9d72
1 parent 4269832
commit ead9d72
Show file tree

Hide file tree

Showing 6 changed files with 95 additions and 83 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
  * Add `charset` property to `FrameGrabber` and `FrameRecorder` to use for metadata from FFmpeg ([pull #1720](https://github.com/bytedeco/javacv/pull/1720))
  * Call `Frame.close()` on temporary clones in `Java2DFrameUtils` to prevent premature deallocations ([issue #1716](https://github.com/bytedeco/javacv/issues/1716))
  * Ignore errors from `avcodec_send_packet()` and `avcodec_receive_frame()` to emulate old API in `FFmpegFrameGrabber` ([issue #1679](https://github.com/bytedeco/javacv/issues/1679))
- * Upgrade dependencies for OpenBLAS 0.3.19, OpenCV 4.5.5, FFmpeg 4.4.1, librealsense2 2.50.0, Leptonica 1.82.0, Tesseract 5.0.1
+ * Upgrade dependencies for OpenBLAS 0.3.19, OpenCV 4.5.5, FFmpeg 5.0, librealsense2 2.50.0, Leptonica 1.82.0, Tesseract 5.0.1
 
 ### August 2, 2021 version 1.5.6
  * Enhance audio and video synchronization of `JavaFxPlayVideoAndAudio` sample ([pull #1662](https://github.com/bytedeco/javacv/pull/1662))

diff --git a/platform/pom.xml b/platform/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>ffmpeg-platform</artifactId>
-      <version>4.4.1-${javacpp.version}</version>
+      <version>5.0-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>ffmpeg</artifactId>
-      <version>4.4.1-${javacpp.version}</version>
+      <version>5.0-${javacpp.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -195,6 +195,7 @@
           <source>1.7</source>
           <target>1.7</target>
           <excludes>
+            <exclude>org/bytedeco/javacv/FFmpegLockCallback.java</exclude>
             <exclude>org/bytedeco/javacv/FlyCaptureFrameGrabber.java</exclude>
           </excludes>
         </configuration>

diff --git a/src/main/java/org/bytedeco/javacv/FFmpegFrameFilter.java b/src/main/java/org/bytedeco/javacv/FFmpegFrameFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2020 Samuel Audet
+ * Copyright (C) 2015-2022 Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -104,8 +104,8 @@ public static void tryLoad() throws Exception {
                 Loader.load(org.bytedeco.ffmpeg.global.swscale.class);
                 Loader.load(org.bytedeco.ffmpeg.global.avfilter.class);
 
-                av_register_all();
-                avfilter_register_all();
+//                av_register_all();
+//                avfilter_register_all();
             } catch (Throwable t) {
                 if (t instanceof Exception) {
                     throw loadingException = (Exception)t;

diff --git a/src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java b/src/main/java/org/bytedeco/javacv/FFmpegFrameGrabber.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2021 Samuel Audet
+ * Copyright (C) 2009-2022 Samuel Audet
  *
  * Licensed either under the Apache License, Version 2.0, or (at your option)
  * under the terms of the GNU General Public License as published by
@@ -115,8 +115,8 @@ public static void tryLoad() throws Exception {
 
                 // Register all formats and codecs
                 av_jni_set_java_vm(Loader.getJavaVM(), null);
-                avcodec_register_all();
-                av_register_all();
+//                avcodec_register_all();
+//                av_register_all();
                 avformat_network_init();
 
                 Loader.load(org.bytedeco.ffmpeg.global.avdevice.class);
@@ -131,12 +131,12 @@ public static void tryLoad() throws Exception {
         }
     }
 
-    static {
-        try {
-            tryLoad();
-            FFmpegLockCallback.init();
-        } catch (Exception ex) { }
-    }
+//    static {
+//        try {
+//            tryLoad();
+//            FFmpegLockCallback.init();
+//        } catch (Exception ex) { }
+//    }
 
     public FFmpegFrameGrabber(File file) {
         this(file.getAbsolutePath());
@@ -296,7 +296,7 @@ static class ReadCallback extends Read_packet_Pointer_BytePointer_int {
                 InputStream is = inputStreams.get(opaque);
                 int size = is.read(b, 0, buf_size);
                 if (size < 0) {
-                    return 0;
+                    return AVERROR_EOF();
                 } else {
                     buf.put(b, 0, size);
                     return size;