Add AVDictionary* to MediaDictionary conversion.

helloxubo · Sep 22, 2022 · 3271df0 · 3271df0
1 parent d26ef06
commit 3271df0
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/src/Sdcb.FFmpeg.AutoGen/Gen2/G2TypeConvert.cs b/src/Sdcb.FFmpeg.AutoGen/Gen2/G2TypeConvert.cs
@@ -15,6 +15,7 @@ public static G2TypeConverter Create(Dictionary<string, G2TransformDef> knownDef
             {
                 TypeCastDef.StaticCastStruct("AVCodec*", "Codec"),
                 TypeCastDef.StaticCastStruct("AVClass*", "FFmpegClass"),
+                TypeCastDef.StaticCastClass("AVDictionary*", "MediaDictionary", isOwner: false),
                 TypeCastDef.Force("void*", "IntPtr"),
                 TypeCastDef.Force("byte*", "IntPtr"),
             });

diff --git a/src/Sdcb.FFmpeg/Codecs/Frame.g.cs b/src/Sdcb.FFmpeg/Codecs/Frame.g.cs
@@ -407,13 +407,14 @@ public long PktDuration
     }
 
     /// <summary>
+    /// <para>original type: AVDictionary*</para>
     /// <para>metadata. - encoding: Set by user. - decoding: Set by libavcodec.</para>
     /// <see cref="AVFrame.metadata" />
     /// </summary>
-    public AVDictionary* Metadata
+    public MediaDictionary Metadata
     {
-        get => _ptr->metadata;
-        set => _ptr->metadata = value;
+        get => MediaDictionary.FromNative(_ptr->metadata, false);
+        set => _ptr->metadata = (AVDictionary*)value;
     }
 
     /// <summary>

diff --git a/src/Sdcb.FFmpeg/Formats/FormatContext.g.cs b/src/Sdcb.FFmpeg/Formats/FormatContext.g.cs
@@ -297,13 +297,14 @@ public AVChapter** Chapters
     }
 
     /// <summary>
+    /// <para>original type: AVDictionary*</para>
     /// <para>Metadata that applies to the whole file.</para>
     /// <see cref="AVFormatContext.metadata" />
     /// </summary>
-    public AVDictionary* Metadata
+    public MediaDictionary Metadata
     {
-        get => _ptr->metadata;
-        set => _ptr->metadata = value;
+        get => MediaDictionary.FromNative(_ptr->metadata, false);
+        set => _ptr->metadata = (AVDictionary*)value;
     }
 
     /// <summary>

diff --git a/src/Sdcb.FFmpeg/Formats/MediaProgram.g.cs b/src/Sdcb.FFmpeg/Formats/MediaProgram.g.cs
@@ -81,12 +81,13 @@ public uint NbStreamIndexes
     }
 
     /// <summary>
+    /// <para>original type: AVDictionary*</para>
     /// <see cref="AVProgram.metadata" />
     /// </summary>
-    public AVDictionary* Metadata
+    public MediaDictionary Metadata
     {
-        get => _ptr->metadata;
-        set => _ptr->metadata = value;
+        get => MediaDictionary.FromNative(_ptr->metadata, false);
+        set => _ptr->metadata = (AVDictionary*)value;
     }
 
     /// <summary>

diff --git a/src/Sdcb.FFmpeg/Formats/MediaStream.g.cs b/src/Sdcb.FFmpeg/Formats/MediaStream.g.cs
@@ -135,12 +135,13 @@ public AVRational SampleAspectRatio
     }
 
     /// <summary>
+    /// <para>original type: AVDictionary*</para>
     /// <see cref="AVStream.metadata" />
     /// </summary>
-    public AVDictionary* Metadata
+    public MediaDictionary Metadata
     {
-        get => _ptr->metadata;
-        set => _ptr->metadata = value;
+        get => MediaDictionary.FromNative(_ptr->metadata, false);
+        set => _ptr->metadata = (AVDictionary*)value;
     }
 
     /// <summary>

diff --git a/src/Sdcb.FFmpeg/Sdcb.FFmpeg.csproj b/src/Sdcb.FFmpeg/Sdcb.FFmpeg.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <PackageId>Sdcb.FFmpeg</PackageId>
         <VersionPrefix>5.1.1</VersionPrefix>
-        <VersionSuffix>preview.6</VersionSuffix>
+        <VersionSuffix>preview.7</VersionSuffix>
         <LangVersion>latest</LangVersion>
         <!-- Build symbol package (.snupkg) to distribute the PDB containing Source Link -->
         <IncludeSymbols>true</IncludeSymbols>