Compatibility with older FFmpeg versions

Author: Yahweasel

funcs.json

@@ -135,7 +135,8 @@
             ["AVPacketSideData_size", "number", ["number", "number"]],
             ["AVPacketSideData_type", "number", ["number", "number"]],
             ["av_packet_unref", null, ["number"]],
-            ["av_shrink_packet", null, ["number", "number"]]
+            ["av_shrink_packet", null, ["number", "number"]],
+            ["ff_codecpar_new_side_data", "number", ["number", "number", "number"]]
         ],
 
         "meta": [
@@ -163,6 +164,7 @@
                 "codec_id",
                 "codec_tag",
                 "codec_type",
+                "coded_side_data",
                 "color_primaries",
                 "color_range",
                 "color_space",
@@ -173,6 +175,7 @@
                 {"name": "framerate", "rational": true},
                 "height",
                 "level",
+                "nb_coded_side_data",
                 "profile",
                 "sample_rate",
                 "width"
@@ -378,6 +381,7 @@
                 "channels",
                 "channel_layoutmask",
                 "ch_layout_nb_channels",
+                "coded_side_data",
                 "compression_level",
                 "extradata",
                 "extradata_size",
@@ -388,6 +392,7 @@
                 "keyint_min",
                 "level",
                 "max_b_frames",
+                "nb_coded_side_data",
                 "pix_fmt",
                 "profile",
                 "rc_max_rate",

src/b-avcodec.c

@@ -33,15 +33,17 @@ B(enum AVMediaType, type)
 B(enum AVCodecID, codec_id)
 B(enum AVMediaType, codec_type)
 BL(int64_t, bit_rate)
+B(AVPacketSideData *, coded_side_data)
+B(int, compression_level)
 B(uint8_t *, extradata)
 B(int, extradata_size)
-B(int, compression_level)
 B(int, frame_size)
 B(int, gop_size)
 B(int, height)
 B(int, keyint_min)
 B(int, level)
 B(int, max_b_frames)
+B(int, nb_coded_side_data)
 B(int, pix_fmt)
 B(int, profile)
 BL(int64_t, rc_max_rate)
@@ -93,6 +95,16 @@ B(enum AVColorTransferCharacteristic, color_trc)
 B(enum AVColorSpace, color_space)
 B(enum AVChromaLocation, chroma_location)
 B(int, sample_rate)
+
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 30, 100)
+B(AVPacketSideData *, coded_side_data)
+B(int, nb_coded_side_data)
+#else
+AVPacketSideData *AVCodecParameters_coded_side_data(AVCodecParameters *a) { return NULL; }
+void AVCodecParameters_coded_side_data_s(AVCodecParameters *a, AVPacketSideData *b) {}
+int AVCodecParameters_nb_coded_side_data(AVCodecParameters *a) { return 0; }
+void AVCodecParameters_nb_coded_side_data_s(AVCodecParameters *a, AVPacketSideData *b) {}
+#endif
 #undef B
 
 #if LIBAVCODEC_VERSION_INT > AV_VERSION_INT(60, 10, 100)
@@ -103,6 +115,20 @@ RAT_FAKE(AVCodecParameters, framerate, 60, 1)
 
 CHL(AVCodecParameters)
 
+uint8_t *ff_codecpar_new_side_data(
+    AVCodecParameters *codecpar, enum AVPacketSideDataType type, size_t size
+) {
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(60, 30, 100)
+    AVPacketSideData *sd = av_packet_side_data_new(
+        &codecpar->coded_side_data, &codecpar->nb_coded_side_data, type, size,
+        0
+    );
+    return sd ? sd->data : NULL;
+#else
+    return NULL;
+#endif
+}
+
 
 /* AVPacket */
 #define B(type, field) A(AVPacket, type, field)

src/libav.types.in.d.ts

@@ -277,6 +277,11 @@ declare namespace LibAV {
          */
         channel_layoutmask?: number;
         channels?: number;
+
+        /**
+         * Side data. Codec-specific.
+         */
+        coded_side_data?: any;
     }
 
     /**

src/p-avfcbridge.in.js

@@ -52,14 +52,15 @@ var ff_copyout_packet = Module.ff_copyout_packet = function(pkt) {
         flags: AVPacket_flags(pkt),
         duration: AVPacket_duration(pkt),
         durationhi: AVPacket_durationhi(pkt),
-        side_data: ff_copyout_side_data(pkt)
+        side_data: ff_copyout_side_data(
+            AVPacket_side_data(pkt),
+            AVPacket_side_data_elems(pkt)
+        )
     };
 };
 
 // Copy out a packet's side data. Used internally by ff_copyout_packet.
-var ff_copyout_side_data = Module.ff_copyout_side_data = function(pkt) {
-    var side_data = AVPacket_side_data(pkt);
-    var side_data_elems = AVPacket_side_data_elems(pkt);
+var ff_copyout_side_data = Module.ff_copyout_side_data = function(side_data, side_data_elems) {
     if (!side_data) return null;
 
     var ret = [];
@@ -114,9 +115,8 @@ var ff_copyin_packet = Module.ff_copyin_packet = function(pktPtr, packet) {
     ff_set_packet(pktPtr, packet.data);
 
     [
-        "dts", "dtshi", "duration", "durationhi", "flags", "side_data",
-        "side_data_elems", "stream_index", "pts", "ptshi", "time_base_num",
-        "time_base_den"
+        "dts", "dtshi", "duration", "durationhi", "flags", "stream_index",
+        "pts", "ptshi", "time_base_num", "time_base_den"
     ].forEach(function(key) {
         if (key in packet)
             CAccessors["AVPacket_" + key + "_s"](pktPtr, packet[key]);
@@ -128,6 +128,8 @@ var ff_copyin_packet = Module.ff_copyin_packet = function(pktPtr, packet) {
 
 // Copy in a packet's side data. Used internally by ff_copyin_packet.
 var ff_copyin_side_data = Module.ff_copyin_side_data = function(pktPtr, side_data) {
+    AVPacket_side_data_s(pktPtr, 0);
+    AVPacket_side_data_elems_s(pktPtr, 0);
     side_data.forEach(function(elem) {
         var data = av_packet_new_side_data(pktPtr, elem.type, elem.data.length);
         if (data === 0)
@@ -160,7 +162,11 @@ var ff_copyout_codecpar = Module.ff_copyout_codecpar = function(codecpar) {
         profile: AVCodecParameters_profile(codecpar),
         sample_rate: AVCodecParameters_sample_rate(codecpar),
         width: AVCodecParameters_width(codecpar),
-        extradata: ff_copyout_codecpar_extradata(codecpar)
+        extradata: ff_copyout_codecpar_extradata(codecpar),
+        coded_side_data: ff_copyout_side_data(
+            AVCodecParameters_coded_side_data(codecpar),
+            AVCodecParameters_nb_coded_side_data(codecpar)
+        )
     };
 };
 
@@ -181,16 +187,19 @@ var ff_copyout_codecpar_extradata = Module.ff_copyout_codecpar_extradata = funct
 var ff_copyin_codecpar = Module.ff_copyin_codecpar = function(codecparPtr, codecpar) {
     [
         "bit_rate", "channel_layoutmask", "channels", "chroma_location",
-        "codec_id", "codec_tag", "codec_type", "color_primaries", "color_range",
-        "color_space", "color_trc", "format", "height", "level", "profile",
-        "sample_rate", "width"
+        "codec_id", "codec_tag", "codec_type", "coded_side_data",
+        "color_primaries", "color_range", "color_space", "color_trc", "format",
+        "height", "level", "nb_coded_side_data", "profile", "sample_rate",
+        "width"
     ].forEach(function(key) {
         if (key in codecpar)
             CAccessors["AVCodecParameters_" + key + "_s"](codecparPtr, codecpar[key]);
     });
 
     if (codecpar.extradata)
         ff_copyin_codecpar_extradata(codecparPtr, codecpar.extradata);
+    if (codecpar.coded_side_data)
+        ff_copyin_codecpar_side_data(codecparPtr, codecpar.side_data);
 };
 
 // Copy in codec parameter extradata. Used internally by ff_copyin_codecpar.
@@ -200,3 +209,15 @@ var ff_copyin_codecpar_extradata = Module.ff_copyin_codecpar_extradata = functio
     AVCodecParameters_extradata_s(codecparPtr, extradataPtr);
     AVCodecParameters_extradata_size_s(codecparPtr, extradata.length);
 };
+
+// Copy in a codecpar's side data. Used internally by ff_copyin_codecpar.
+var ff_copyin_codecpar_side_data = Module.ff_copyin_codecpar_side_data = function(codecpar, side_data) {
+    AVCodecParameters_coded_side_data_s(codecpar, 0);
+    AVCodecParameters_nb_coded_side_data_s(codecpar, 0);
+    side_data.forEach(function(elem) {
+        var data = ff_codecpar_new_side_data(codecpar, elem.type, elem.data.length);
+        if (data === 0)
+            throw new Error("Failed to allocate side data!");
+        copyin_u8(data, elem.data);
+    });
+};