revise FFmpeg 4.4 update from review comments

README.md

@@ -166,7 +166,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
 Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
 
  * OpenCV 4.5.2  https://opencv.org/releases.html
- * FFmpeg 4.3.x  http://ffmpeg.org/download.html
+ * FFmpeg 4.4.x  http://ffmpeg.org/download.html
  * FlyCapture 2.13.x  https://www.flir.com/products/flycapture-sdk
  * Spinnaker 1.27.x https://www.flir.com/products/spinnaker-sdk
  * libdc1394 2.2.6  http://sourceforge.net/projects/libdc1394/files/

ffmpeg/README.md

@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * FFmpeg 4.3.2  http://ffmpeg.org/
+ * FFmpeg 4.4  http://ffmpeg.org/
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -38,22 +38,22 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.ffmpeg</groupId>
     <artifactId>readfewframe</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>ReadFewFrame</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ffmpeg-platform</artifactId>
-            <version>4.3.2-1.5.5</version>
+            <version>4.4.0-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- Optional GPL builds with (almost) everything enabled -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ffmpeg-platform-gpl</artifactId>
-            <version>4.3.2-1.5.5</version>
+            <version>4.4.0-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

ffmpeg/platform/gpl/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>ffmpeg-platform-gpl</artifactId>
-  <version>4.3.2-${project.parent.version}</version>
+  <version>4.4.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for FFmpeg (GPL enabled)</name>
 
   <properties>

ffmpeg/platform/pom.xml

@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>ffmpeg-platform</artifactId>
-  <version>4.3.2-${project.parent.version}</version>
+  <version>4.4.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for FFmpeg</name>
 
   <properties>

ffmpeg/samples/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.ffmpeg</groupId>
     <artifactId>readfewframe</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>ReadFewFrame</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,14 +12,14 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ffmpeg-platform</artifactId>
-            <version>4.3.2-1.5.5</version>
+            <version>4.4.0-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- Optional GPL builds with (almost) everything enabled -->
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>ffmpeg-platform-gpl</artifactId>
-            <version>4.3.2-1.5.5</version>
+            <version>4.4.00-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFContext.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFInternal.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBSFList.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilter.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVBitStreamFilterContext.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCPBProperties.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 

ffmpeg/src/gen/java/org/bytedeco/ffmpeg/avcodec/AVCodec.java

@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.ffmpeg.avcodec;
 
@@ -92,7 +92,9 @@ public class AVCodec extends Pointer {
      *****************************************************************
      */
     public native int priv_data_size(); public native AVCodec priv_data_size(int setter);
+// #if FF_API_NEXT
     public native AVCodec next(); public native AVCodec next(AVCodec setter);
+// #endif
     /**
      * \name Frame-level threading support functions
      * \{
@@ -121,7 +123,7 @@ public static class Update_thread_context_AVCodecContext_AVCodecContext extends
     public native @Const AVCodecDefault defaults(); public native AVCodec defaults(AVCodecDefault setter);
 
     /**
-     * Initialize codec static data, called from avcodec_register().
+     * Initialize codec static data, called from av_codec_iterate().
      *
      * This is not intended for time consuming operations as it is
      * run for every codec regardless of that codec being used.
@@ -159,7 +161,7 @@ public native int call(AVCodecContext arg0, @Cast("uint8_t*") BytePointer buf, i
      * Encode data to an AVPacket.
      *
      * @param      avctx          codec context
-     * @param      avpkt          output AVPacket (may contain a user-provided buffer)
+     * @param      avpkt          output AVPacket
      * @param frame [in]          AVFrame containing the raw data to be encoded
      * @param got_packet_ptr [out] encoder sets to 0 or 1 to indicate that a
      *                            non-empty packet was returned in avpkt.
@@ -175,13 +177,26 @@ public native int call(AVCodecContext avctx, AVPacket avpkt,
                        @Const AVFrame frame, IntPointer got_packet_ptr);
     }
     public native Encode2_AVCodecContext_AVPacket_AVFrame_IntPointer encode2(); public native AVCodec encode2(Encode2_AVCodecContext_AVPacket_AVFrame_IntPointer setter);
+    /**
+     * Decode picture or subtitle data.
+     *
+     * @param      avctx          codec context
+     * @param      outdata        codec type dependent output struct
+     * @param got_frame_ptr [out]  decoder sets to 0 or 1 to indicate that a
+     *                            non-empty frame or subtitle was returned in
+     *                            outdata.
+     * @param avpkt [in]          AVPacket containing the data to be decoded
+     * @return amount of bytes read from the packet on success, negative error
+     *         code on failure
+     */
     public static class Decode_AVCodecContext_Pointer_IntPointer_AVPacket extends FunctionPointer {
         static { Loader.load(); }
         /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
         public    Decode_AVCodecContext_Pointer_IntPointer_AVPacket(Pointer p) { super(p); }
         protected Decode_AVCodecContext_Pointer_IntPointer_AVPacket() { allocate(); }
         private native void allocate();
-        public native int call(AVCodecContext arg0, Pointer outdata, IntPointer outdata_size, AVPacket avpkt);
+        public native int call(AVCodecContext avctx, Pointer outdata,
+                      IntPointer got_frame_ptr, AVPacket avpkt);
     }
     public native Decode_AVCodecContext_Pointer_IntPointer_AVPacket decode(); public native AVCodec decode(Decode_AVCodecContext_Pointer_IntPointer_AVPacket setter);
     public static class Close_AVCodecContext extends FunctionPointer {
@@ -194,22 +209,10 @@ public static class Close_AVCodecContext extends FunctionPointer {
     }
     public native @Name("close") Close_AVCodecContext _close(); public native AVCodec _close(Close_AVCodecContext setter);
     /**
-     * Encode API with decoupled packet/frame dataflow. The API is the
-     * same as the avcodec_ prefixed APIs (avcodec_send_frame() etc.), except
-     * that:
-     * - never called if the codec is closed or the wrong type,
-     * - if AV_CODEC_CAP_DELAY is not set, drain frames are never sent,
-     * - only one drain frame is ever passed down,
+     * Encode API with decoupled frame/packet dataflow. This function is called
+     * to get one output packet. It should call ff_encode_get_frame() to obtain
+     * input data.
      */
-    public static class Send_frame_AVCodecContext_AVFrame extends FunctionPointer {
-        static { Loader.load(); }
-        /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
-        public    Send_frame_AVCodecContext_AVFrame(Pointer p) { super(p); }
-        protected Send_frame_AVCodecContext_AVFrame() { allocate(); }
-        private native void allocate();
-        public native int call(AVCodecContext avctx, @Const AVFrame frame);
-    }
-    public native Send_frame_AVCodecContext_AVFrame send_frame(); public native AVCodec send_frame(Send_frame_AVCodecContext_AVFrame setter);
     public static class Receive_packet_AVCodecContext_AVPacket extends FunctionPointer {
         static { Loader.load(); }
         /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
@@ -266,8 +269,7 @@ public static class Flush_AVCodecContext extends FunctionPointer {
      *
      * The user can only access this field via avcodec_get_hw_config().
      */
-    public native @Cast("const AVCodecHWConfigInternal*") Pointer hw_configs(int i); public native AVCodec hw_configs(int i, Pointer setter);
-    @MemberGetter public native @Cast("const AVCodecHWConfigInternal**") PointerPointer hw_configs();
+
 
     /**
      * List of supported codec_tags, terminated by FF_CODEC_TAGS_END.