Update for ffmpeg 7.1.1 (#320)

* Enhance audio/video processing and CI configuration

Updated CI configuration to use .NET 6.0.x and improved artifact upload actions. Incremented version number in `Directory.Build.props` to 7.1.1.

Introduced new delegates and structures in `Delegates.g.cs` for AVFilter functionality, and expanded `AVChannel` enum for additional audio channel types. Added `AVCodecConfig` enum for codec parameters and deprecated certain fields in `AVCodec`.

Enhanced `ffmpeg` facade with new functions for side data and mastering display metadata. Expanded `AVPacketSideDataType` and `AVOptionType` enums for improved metadata handling.

Modified `AVCodecContext` to include a duration probe size field and updated `AVCodecID` enum with new codec IDs for LC3 and LCEVC.

Versioning information in `version.h` and `version_major.h` was updated, and XvMC support was deprecated in `xvmc.h`.

* Add readme

* add read me to poackages

---------

Co-authored-by: Ruslan Balanukhin <[email protected]>

Author: fastman61

.github/workflows/main.yml

@@ -13,6 +13,9 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '6.0.x'
       - name: Install FFmpeg - linux
         if: matrix.os == 'ubuntu-latest'
         run: |
@@ -23,7 +26,7 @@ jobs:
       - name: Test
         run: |
           dotnet test -c Release
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         if: matrix.os == 'windows-latest'
         with:
           path: FFmpeg.AutoGen/bin/Release/*.nupkg

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <PackageId>$(AssemblyName)</PackageId>
-    <Version>7.0</Version>
+    <Version>7.1.1.0</Version>
     <Authors>Ruslan Balanukhin</Authors>
     <Company>Rationale One</Company>
     <Product>FFmpeg.AutoGen</Product>
@@ -12,6 +12,7 @@
     <FileVersion>$(Version)</FileVersion>
     <PackageTags>ffmpeg</PackageTags>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -21,6 +22,7 @@
 
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)LICENSE.txt" Link="LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
+    <None Include="$(MSBuildThisFileDirectory)README.md" Link="README.md" Pack="true" PackagePath="README.md" />
   </ItemGroup>
 
 </Project>

FFmpeg.AutoGen.Abstractions/generated/Delegates.g.cs

@@ -11,6 +11,14 @@ public unsafe struct _query_func_func
     public static implicit operator _query_func_func(_query_func func) => new _query_func_func { Pointer = func == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(func) };
 }
 
+[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+public unsafe delegate int _query_func2 (AVFilterContext* @p0, AVFilterFormatsConfig** @cfg_in, AVFilterFormatsConfig** @cfg_out);
+public unsafe struct _query_func2_func
+{
+    public IntPtr Pointer;
+    public static implicit operator _query_func2_func(_query_func2 func) => new _query_func2_func { Pointer = func == null ? IntPtr.Zero : Marshal.GetFunctionPointerForDelegate(func) };
+}
+
 [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 public unsafe delegate void av_buffer_create_free (void* @opaque, byte* @data);
 public unsafe struct av_buffer_create_free_func

FFmpeg.AutoGen.Abstractions/generated/Enums.g.cs

@@ -101,6 +101,14 @@ public enum AVChannel : int
     @AV_CHAN_BOTTOM_FRONT_LEFT = 39,
     /// <summary>See above.</summary>
     @AV_CHAN_BOTTOM_FRONT_RIGHT = 40,
+    /// <summary>+90 degrees, Lss, SiL</summary>
+    @AV_CHAN_SIDE_SURROUND_LEFT = 41,
+    /// <summary>-90 degrees, Rss, SiR</summary>
+    @AV_CHAN_SIDE_SURROUND_RIGHT = 42,
+    /// <summary>+110 degrees, Lvs, TpLS</summary>
+    @AV_CHAN_TOP_SURROUND_LEFT = 43,
+    /// <summary>-110 degrees, Rvs, TpRS</summary>
+    @AV_CHAN_TOP_SURROUND_RIGHT = 44,
     /// <summary>Channel is empty can be safely skipped.</summary>
     @AV_CHAN_UNUSED = 512,
     /// <summary>Channel contains data, but its position is unknown.</summary>
@@ -165,6 +173,24 @@ public enum AVClassCategory : int
     @AV_CLASS_CATEGORY_NB = 46,
 }
 
+public enum AVCodecConfig : int
+{
+    /// <summary>AVPixelFormat, terminated by AV_PIX_FMT_NONE</summary>
+    @AV_CODEC_CONFIG_PIX_FORMAT = 0,
+    /// <summary>AVRational, terminated by {0, 0}</summary>
+    @AV_CODEC_CONFIG_FRAME_RATE = 1,
+    /// <summary>int, terminated by 0</summary>
+    @AV_CODEC_CONFIG_SAMPLE_RATE = 2,
+    /// <summary>AVSampleFormat, terminated by AV_SAMPLE_FMT_NONE</summary>
+    @AV_CODEC_CONFIG_SAMPLE_FORMAT = 3,
+    /// <summary>AVChannelLayout, terminated by {0}</summary>
+    @AV_CODEC_CONFIG_CHANNEL_LAYOUT = 4,
+    /// <summary>AVColorRange, terminated by AVCOL_RANGE_UNSPECIFIED</summary>
+    @AV_CODEC_CONFIG_COLOR_RANGE = 5,
+    /// <summary>AVColorSpace, terminated by AVCOL_SPC_UNSPECIFIED</summary>
+    @AV_CODEC_CONFIG_COLOR_SPACE = 6,
+}
+
 /// <summary>Identify the syntax and semantics of the bitstream. The principle is roughly: Two decoders with the same ID can decode the same streams. Two encoders with the same ID can encode compatible streams. There may be slight deviations from the principle due to implementation details.</summary>
 public enum AVCodecID : int
 {
@@ -651,6 +677,7 @@ public enum AVCodecID : int
     @AV_CODEC_ID_AC4 = 86119,
     @AV_CODEC_ID_OSQ = 86120,
     @AV_CODEC_ID_QOA = 86121,
+    @AV_CODEC_ID_LC3 = 86122,
     /// <summary>A dummy ID pointing at the start of subtitle codecs.</summary>
     @AV_CODEC_ID_FIRST_SUBTITLE = 94208,
     @AV_CODEC_ID_DVD_SUBTITLE = 94208,
@@ -695,6 +722,7 @@ public enum AVCodecID : int
     @AV_CODEC_ID_TIMED_ID3 = 98313,
     @AV_CODEC_ID_BIN_DATA = 98314,
     @AV_CODEC_ID_SMPTE_2038 = 98315,
+    @AV_CODEC_ID_LCEVC = 98316,
     /// <summary>codec_id is not known (like AV_CODEC_ID_NONE) but lavf should attempt to identify it</summary>
     @AV_CODEC_ID_PROBE = 102400,
     /// <summary>_FAKE_ codec to indicate a raw MPEG-2 TS stream (only used by libavformat)</summary>
@@ -790,8 +818,14 @@ public enum AVColorSpace : int
     @AVCOL_SPC_CHROMA_DERIVED_CL = 13,
     /// <summary>ITU-R BT.2100-0, ICtCp</summary>
     @AVCOL_SPC_ICTCP = 14,
+    /// <summary>SMPTE ST 2128, IPT-C2</summary>
+    @AVCOL_SPC_IPT_C2 = 15,
+    /// <summary>YCgCo-R, even addition of bits</summary>
+    @AVCOL_SPC_YCGCO_RE = 16,
+    /// <summary>YCgCo-R, odd addition of bits</summary>
+    @AVCOL_SPC_YCGCO_RO = 17,
     /// <summary>Not part of ABI</summary>
-    @AVCOL_SPC_NB = 15,
+    @AVCOL_SPC_NB = 18,
 }
 
 /// <summary>Color Transfer Characteristic. These values match the ones defined by ISO/IEC 23091-2_2019 subclause 8.2.</summary>
@@ -966,6 +1000,10 @@ public enum AVFrameSideDataType : int
     @AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT = 26,
     /// <summary>Provide encoder-specific hinting information about changed/unchanged portions of a frame. It can be used to pass information about which macroblocks can be skipped because they didn&apos;t change from the corresponding ones in the previous frame. This could be useful for applications which know this information in advance to speed up encoding.</summary>
     @AV_FRAME_DATA_VIDEO_HINT = 27,
+    /// <summary>Raw LCEVC payload data, as a uint8_t array, with NAL emulation bytes intact.</summary>
+    @AV_FRAME_DATA_LCEVC = 28,
+    /// <summary>This side data must be associated with a video frame. The presence of this side data indicates that the video stream is composed of multiple views (e.g. stereoscopic 3D content, cf. H.264 Annex H or H.265 Annex G). The data is an int storing the view ID.</summary>
+    @AV_FRAME_DATA_VIEW_ID = 29,
 }
 
 /// <summary>Option for overlapping elliptical pixel selectors in an image.</summary>
@@ -1060,31 +1098,49 @@ public enum AVMediaType : int
     @AVMEDIA_TYPE_NB = 5,
 }
 
-/// <summary>@{ AVOptions provide a generic system to declare options on arbitrary structs (&quot;objects&quot;). An option can have a help text, a type and a range of possible values. Options may then be enumerated, read and written to.</summary>
+/// <summary>An option type determines: - for native access, the underlying C type of the field that an AVOption refers to; - for foreign access, the semantics of accessing the option through this API, e.g. which av_opt_get_*() and av_opt_set_*() functions can be called, or what format will av_opt_get()/av_opt_set() expect/produce.</summary>
 public enum AVOptionType : int
 {
+    /// <summary>Underlying C type is unsigned int.</summary>
     @AV_OPT_TYPE_FLAGS = 1,
+    /// <summary>Underlying C type is int.</summary>
     @AV_OPT_TYPE_INT = 2,
+    /// <summary>Underlying C type is int64_t.</summary>
     @AV_OPT_TYPE_INT64 = 3,
+    /// <summary>Underlying C type is double.</summary>
     @AV_OPT_TYPE_DOUBLE = 4,
+    /// <summary>Underlying C type is float.</summary>
     @AV_OPT_TYPE_FLOAT = 5,
+    /// <summary>Underlying C type is a uint8_t* that is either NULL or points to a C string allocated with the av_malloc() family of functions.</summary>
     @AV_OPT_TYPE_STRING = 6,
+    /// <summary>Underlying C type is AVRational.</summary>
     @AV_OPT_TYPE_RATIONAL = 7,
-    /// <summary>offset must point to a pointer immediately followed by an int for the length</summary>
+    /// <summary>Underlying C type is a uint8_t* that is either NULL or points to an array allocated with the av_malloc() family of functions. The pointer is immediately followed by an int containing the array length in bytes.</summary>
     @AV_OPT_TYPE_BINARY = 8,
+    /// <summary>Underlying C type is AVDictionary*.</summary>
     @AV_OPT_TYPE_DICT = 9,
+    /// <summary>Underlying C type is uint64_t.</summary>
     @AV_OPT_TYPE_UINT64 = 10,
+    /// <summary>Special option type for declaring named constants. Does not correspond to an actual field in the object, offset must be 0.</summary>
     @AV_OPT_TYPE_CONST = 11,
-    /// <summary>offset must point to two consecutive integers</summary>
+    /// <summary>Underlying C type is two consecutive integers.</summary>
     @AV_OPT_TYPE_IMAGE_SIZE = 12,
+    /// <summary>Underlying C type is enum AVPixelFormat.</summary>
     @AV_OPT_TYPE_PIXEL_FMT = 13,
+    /// <summary>Underlying C type is enum AVSampleFormat.</summary>
     @AV_OPT_TYPE_SAMPLE_FMT = 14,
-    /// <summary>offset must point to AVRational</summary>
+    /// <summary>Underlying C type is AVRational.</summary>
     @AV_OPT_TYPE_VIDEO_RATE = 15,
+    /// <summary>Underlying C type is int64_t.</summary>
     @AV_OPT_TYPE_DURATION = 16,
+    /// <summary>Underlying C type is uint8_t[4].</summary>
     @AV_OPT_TYPE_COLOR = 17,
+    /// <summary>Underlying C type is int.</summary>
     @AV_OPT_TYPE_BOOL = 18,
+    /// <summary>Underlying C type is AVChannelLayout.</summary>
     @AV_OPT_TYPE_CHLAYOUT = 19,
+    /// <summary>Underlying C type is unsigned int.</summary>
+    @AV_OPT_TYPE_UINT = 20,
     /// <summary>May be combined with another regular option type to declare an array option.</summary>
     @AV_OPT_TYPE_FLAG_ARRAY = 65536,
 }
@@ -1164,8 +1220,12 @@ public enum AVPacketSideDataType : int
     @AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM = 34,
     /// <summary>Ambient viewing environment metadata, as defined by H.274. This metadata should be associated with a video stream and contains data in the form of the AVAmbientViewingEnvironment struct.</summary>
     @AV_PKT_DATA_AMBIENT_VIEWING_ENVIRONMENT = 35,
+    /// <summary>The number of pixels to discard from the top/bottom/left/right border of the decoded frame to obtain the sub-rectangle intended for presentation.</summary>
+    @AV_PKT_DATA_FRAME_CROPPING = 36,
+    /// <summary>Raw LCEVC payload data, as a uint8_t array, with NAL emulation bytes intact.</summary>
+    @AV_PKT_DATA_LCEVC = 37,
     /// <summary>The number of side data types. This is not part of the public API/ABI in the sense that it may change when new side data types are added. This must stay the last enum value. If its value becomes huge, some code using it needs to be updated as it assumes it to be smaller than other limits.</summary>
-    @AV_PKT_DATA_NB = 36,
+    @AV_PKT_DATA_NB = 38,
 }
 
 /// <summary>@{</summary>
@@ -1726,12 +1786,21 @@ public enum AVSideDataParamChangeFlags : int
     @AV_SIDE_DATA_PARAM_CHANGE_DIMENSIONS = 8,
 }
 
+public enum AVSideDataProps : int
+{
+    /// <summary>The side data type can be used in stream-global structures. Side data types without this property are only meaningful on per-frame basis.</summary>
+    @AV_SIDE_DATA_PROP_GLOBAL = 1,
+    /// <summary>Multiple instances of this side data type can be meaningfully present in a single side data array.</summary>
+    @AV_SIDE_DATA_PROP_MULTI = 2,
+}
+
 public enum AVStreamGroupParamsType : int
 {
     @AV_STREAM_GROUP_PARAMS_NONE = 0,
     @AV_STREAM_GROUP_PARAMS_IAMF_AUDIO_ELEMENT = 1,
     @AV_STREAM_GROUP_PARAMS_IAMF_MIX_PRESENTATION = 2,
     @AV_STREAM_GROUP_PARAMS_TILE_GRID = 3,
+    @AV_STREAM_GROUP_PARAMS_LCEVC = 4,
 }
 
 /// <summary>@}</summary>

FFmpeg.AutoGen.Abstractions/generated/Structs.g.cs

@@ -165,13 +165,13 @@ public unsafe partial struct AVCodec
     public int @capabilities;
     /// <summary>maximum value for lowres supported by the decoder</summary>
     public byte @max_lowres;
-    /// <summary>array of supported framerates, or NULL if any, array is terminated by {0,0}</summary>
+    [Obsolete("use avcodec_get_supported_config()")]
     public AVRational* @supported_framerates;
-    /// <summary>array of supported pixel formats, or NULL if unknown, array is terminated by -1</summary>
+    [Obsolete("use avcodec_get_supported_config()")]
     public AVPixelFormat* @pix_fmts;
-    /// <summary>array of supported audio samplerates, or NULL if unknown, array is terminated by 0</summary>
+    [Obsolete("use avcodec_get_supported_config()")]
     public int* @supported_samplerates;
-    /// <summary>array of supported sample formats, or NULL if unknown, array is terminated by -1</summary>
+    [Obsolete("use avcodec_get_supported_config()")]
     public AVSampleFormat* @sample_fmts;
     /// <summary>AVClass for the private context</summary>
     public AVClass* @priv_class;
@@ -180,6 +180,7 @@ public unsafe partial struct AVCodec
     /// <summary>Group name of the codec implementation. This is a short symbolic name of the wrapper backing this codec. A wrapper uses some kind of external implementation for the codec, such as an external library, or a codec implementation provided by the OS or the hardware. If this field is NULL, this is a builtin, libavcodec native codec. If non-NULL, this will be the suffix in AVCodec.name in most cases (usually AVCodec.name will be of the form &quot;&lt;codec_name&gt;_&lt;wrapper_name&gt;&quot;).</summary>
     public byte* @wrapper_name;
     /// <summary>Array of supported channel layouts, terminated with a zeroed layout.</summary>
+    [Obsolete("use avcodec_get_supported_config()")]
     public AVChannelLayout* @ch_layouts;
 }
 
@@ -870,6 +871,9 @@ public unsafe partial struct AVFilter_formats
     /// <summary>Query formats supported by the filter on its inputs and outputs.</summary>
     [FieldOffset(0)]
     public _query_func_func @query_func;
+    /// <summary>Same as query_func(), except this function writes the results into provided arrays.</summary>
+    [FieldOffset(0)]
+    public _query_func2_func @query_func2;
     /// <summary>A pointer to an array of admissible pixel formats delimited by AV_PIX_FMT_NONE. The generic code will use this list to indicate that this filter supports each of these pixel formats, provided that all inputs and outputs use the same pixel format.</summary>
     [FieldOffset(0)]
     public AVPixelFormat* @pixels_list;
@@ -1031,30 +1035,6 @@ public unsafe partial struct AVFilterLink
     public AVFilterFormatsConfig @incfg;
     /// <summary>Lists of supported formats / etc. supported by the output filter.</summary>
     public AVFilterFormatsConfig @outcfg;
-    /// <summary>Graph the filter belongs to.</summary>
-    public AVFilterGraph* @graph;
-    /// <summary>Current timestamp of the link, as defined by the most recent frame(s), in link time_base units.</summary>
-    public long @current_pts;
-    /// <summary>Current timestamp of the link, as defined by the most recent frame(s), in AV_TIME_BASE units.</summary>
-    public long @current_pts_us;
-    /// <summary>Frame rate of the stream on the link, or 1/0 if unknown or variable; if left to 0/0, will be automatically copied from the first input of the source filter if it exists.</summary>
-    public AVRational @frame_rate;
-    /// <summary>Minimum number of samples to filter at once. If filter_frame() is called with fewer samples, it will accumulate them in fifo. This field and the related ones must not be changed after filtering has started. If 0, all related fields are ignored.</summary>
-    public int @min_samples;
-    /// <summary>Maximum number of samples to filter at once. If filter_frame() is called with more samples, it will split them.</summary>
-    public int @max_samples;
-    /// <summary>Number of past frames sent through the link.</summary>
-    public long @frame_count_in;
-    /// <summary>Number of past frames sent through the link.</summary>
-    public long @frame_count_out;
-    /// <summary>Number of past samples sent through the link.</summary>
-    public long @sample_count_in;
-    /// <summary>Number of past samples sent through the link.</summary>
-    public long @sample_count_out;
-    /// <summary>True if a frame is currently wanted on the output of this filter. Set when ff_request_frame() is called by the output, cleared when a frame is filtered.</summary>
-    public int @frame_wanted_out;
-    /// <summary>For hwaccel pixel formats, this should be a reference to the AVHWFramesContext describing the frames.</summary>
-    public AVBufferRef* @hw_frames_ctx;
 }
 
 /// <summary>Parameters of a filter&apos;s input or output pad.</summary>
@@ -1223,6 +1203,8 @@ public unsafe partial struct AVFormatContext
     public AVFormatContext_io_open_func @io_open;
     /// <summary>A callback for closing the streams opened with AVFormatContext.io_open().</summary>
     public AVFormatContext_io_close2_func @io_close2;
+    /// <summary>Maximum number of bytes read from input in order to determine stream durations when using estimate_timings_from_pts in avformat_find_stream_info(). Demuxing only, set by the caller before avformat_find_stream_info(). Can be set to 0 to let avformat choose using a heuristic.</summary>
+    public long @duration_probesize;
 }
 
 /// <summary>This structure describes decoded (raw) audio or video data.</summary>
@@ -1841,6 +1823,15 @@ public unsafe partial struct AVRegionOfInterest
     public AVRational @qoffset;
 }
 
+/// <summary>This struct describes the properties of a side data type. Its instance corresponding to a given type can be obtained from av_frame_side_data_desc().</summary>
+public unsafe partial struct AVSideDataDescriptor
+{
+    /// <summary>Human-readable side data description.</summary>
+    public byte* @name;
+    /// <summary>Side data property flags, a combination of AVSideDataProps values.</summary>
+    public uint @props;
+}
+
 /// <summary>Stream structure. New fields can be added to the end with minor version bumps. Removal, reordering and changes to existing fields require a major version bump. sizeof(AVStream) must not be used outside libav*.</summary>
 public unsafe partial struct AVStream
 {
@@ -1918,6 +1909,20 @@ public unsafe partial struct AVStreamGroup_params
     public AVIAMFMixPresentation* @iamf_mix_presentation;
     [FieldOffset(0)]
     public AVStreamGroupTileGrid* @tile_grid;
+    [FieldOffset(0)]
+    public AVStreamGroupLCEVC* @lcevc;
+}
+
+/// <summary>AVStreamGroupLCEVC is meant to define the relation between video streams and a data stream containing LCEVC enhancement layer NALUs.</summary>
+public unsafe partial struct AVStreamGroupLCEVC
+{
+    public AVClass* @av_class;
+    /// <summary>Index of the LCEVC data stream in AVStreamGroup.</summary>
+    public uint @lcevc_index;
+    /// <summary>Width of the final stream for presentation.</summary>
+    public int @width;
+    /// <summary>Height of the final image for presentation.</summary>
+    public int @height;
 }
 
 /// <summary>AVStreamGroupTileGrid holds information on how to combine several independent images on a single canvas for presentation.</summary>