TWCC manager relies on buffers meta for recovery percentage

.gitignore

@@ -67,3 +67,6 @@ subprojects/*/
 
 # clangd integration
 .cache/*
+
+# from gdb Python helper scripts
+__pycache__

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "subprojects/gst-integration-testsuites/medias"]
-	path = subprojects/gst-integration-testsuites/medias
-	url = https://gitlab.freedesktop.org/gstreamer/gst-integration-testsuites.git

scripts/generate_init_static_plugins.py

@@ -2,6 +2,7 @@
 
 import argparse
 import os
+import platform
 from string import Template
 
 TEMPLATE = Template('''
@@ -93,7 +94,7 @@ def process_features(features_list, plugins, feature_prefix):
     giomodules_declaration = []
     giomodules_registration = []
 
-    if ',' in options.plugins or ':' in options.plugins:
+    if ',' in options.plugins or (platform.system() != 'Windows' and ':' in options.plugins):
         print("Only ';' is allowed in the list of plugins.")
         exit(1)
 

subprojects/gst-libav/ext/libav/gstavviddec.c

@@ -48,6 +48,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE);
 #define DEFAULT_DIRECT_RENDERING	TRUE
 #define DEFAULT_MAX_THREADS		0
 #define DEFAULT_OUTPUT_CORRUPT		TRUE
+#define DEFAULT_REQUIRE_KEYFRAME  FALSE
 #define REQUIRED_POOL_MAX_BUFFERS       32
 #define DEFAULT_STRIDE_ALIGN            31
 #define DEFAULT_ALLOC_PARAM             { 0, DEFAULT_STRIDE_ALIGN, 0, 0, }
@@ -65,6 +66,7 @@ enum
   PROP_OUTPUT_CORRUPT,
   PROP_THREAD_TYPE,
   PROP_STD_COMPLIANCE,
+  PROP_REQUIRE_KEYFRAME,
   PROP_LAST
 };
 
@@ -295,6 +297,11 @@ gst_ffmpegviddec_subclass_init (GstFFMpegVidDecClass * klass,
       g_param_spec_boolean ("output-corrupt", "Output corrupt buffers",
           "Whether libav should output frames even if corrupted",
           DEFAULT_OUTPUT_CORRUPT, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_REQUIRE_KEYFRAME,
+      g_param_spec_boolean ("require-keyframe", "Require keyframe",
+          "Whether the first frame is required to be a keyframe",
+          DEFAULT_REQUIRE_KEYFRAME,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
 
   caps = klass->in_plugin->capabilities;
   if (caps & (AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_SLICE_THREADS)) {
@@ -351,12 +358,14 @@ gst_ffmpegviddec_subinit (GstFFMpegVidDec * ffmpegdec)
   ffmpegdec->output_corrupt = DEFAULT_OUTPUT_CORRUPT;
   ffmpegdec->thread_type = DEFAULT_THREAD_TYPE;
   ffmpegdec->std_compliance = DEFAULT_STD_COMPLIANCE;
+  ffmpegdec->require_keyframe = DEFAULT_REQUIRE_KEYFRAME;
 
   GST_PAD_SET_ACCEPT_TEMPLATE (GST_VIDEO_DECODER_SINK_PAD (ffmpegdec));
   gst_video_decoder_set_use_default_pad_acceptcaps (GST_VIDEO_DECODER_CAST
       (ffmpegdec), TRUE);
 
   gst_video_decoder_set_needs_format (GST_VIDEO_DECODER (ffmpegdec), TRUE);
+  gst_video_decoder_set_needs_sync_point (GST_VIDEO_DECODER (ffmpegdec), TRUE);
 }
 
 static void
@@ -1792,6 +1801,8 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
   } else if (res < 0) {
     GST_VIDEO_DECODER_ERROR (ffmpegdec, 1, STREAM, DECODE, (NULL),
         ("Video decoding error"), *ret);
+    gst_video_decoder_request_sync_point (GST_VIDEO_DECODER_CAST (ffmpegdec),
+        frame, GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT);
     goto beach;
   }
 
@@ -1942,8 +1953,6 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
             GST_TIME_FORMAT, tmp, tmp->system_frame_number,
             GST_TIME_ARGS (tmp->pts), GST_TIME_ARGS (tmp->dts));
         /* drop extra ref and remove from frame list */
-        GST_VIDEO_CODEC_FRAME_FLAG_UNSET (tmp,
-            GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
         gst_video_decoder_release_frame (dec, tmp);
       } else {
         /* drop extra ref we got */
@@ -1954,15 +1963,31 @@ gst_ffmpegviddec_video_frame (GstFFMpegVidDec * ffmpegdec,
     g_list_free (ol);
   }
 
-  av_frame_unref (ffmpegdec->picture);
+  if (ffmpegdec->picture->key_frame ||
+      ffmpegdec->picture->pict_type == AV_PICTURE_TYPE_I)
+    GST_VIDEO_CODEC_FRAME_SET_SYNC_POINT (out_frame);
+  else
+    GST_VIDEO_CODEC_FRAME_UNSET_SYNC_POINT (out_frame);
 
   if (frame)
     GST_VIDEO_CODEC_FRAME_FLAG_UNSET (frame,
         GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED);
+  GST_LOG_OBJECT (ffmpegdec, "out_frame: pict_type %d, key_frame %d -> sync %d",
+      ffmpegdec->picture->pict_type, ffmpegdec->picture->key_frame,
+      GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (out_frame));
 
   if (gst_video_decoder_get_subframe_mode (GST_VIDEO_DECODER (ffmpegdec)))
     gst_video_decoder_have_last_subframe (GST_VIDEO_DECODER (ffmpegdec),
         out_frame);
+  av_frame_unref (ffmpegdec->picture);
+
+  if (ffmpegdec->requiring_keyframe) {
+    if (GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (out_frame))
+      ffmpegdec->requiring_keyframe = FALSE;
+    else
+      gst_video_decoder_request_sync_point (GST_VIDEO_DECODER_CAST (ffmpegdec),
+          frame, GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT);
+  }
 
   /* FIXME: Ideally we would remap the buffer read-only now before pushing but
    * libav might still have a reference to it!
@@ -2158,6 +2183,8 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
    */
   GST_VIDEO_DECODER_STREAM_UNLOCK (ffmpegdec);
   if (avcodec_send_packet (ffmpegdec->context, &packet) < 0) {
+    gst_video_decoder_request_sync_point (GST_VIDEO_DECODER_CAST (ffmpegdec),
+        frame, GST_VIDEO_DECODER_REQUEST_SYNC_POINT_DISCARD_INPUT);
     GST_VIDEO_DECODER_STREAM_LOCK (ffmpegdec);
     av_packet_free_side_data (&packet);
     goto send_packet_failed;
@@ -2209,6 +2236,8 @@ gst_ffmpegviddec_start (GstVideoDecoder * decoder)
   ffmpegdec->context->opaque = ffmpegdec;
   GST_OBJECT_UNLOCK (ffmpegdec);
 
+  ffmpegdec->requiring_keyframe = ffmpegdec->require_keyframe;
+
   return TRUE;
 }
 
@@ -2486,6 +2515,8 @@ gst_ffmpegviddec_set_property (GObject * object,
       break;
     case PROP_STD_COMPLIANCE:
       ffmpegdec->std_compliance = g_value_get_enum (value);
+    case PROP_REQUIRE_KEYFRAME:
+      ffmpegdec->require_keyframe = g_value_get_boolean (value);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -2526,6 +2557,9 @@ gst_ffmpegviddec_get_property (GObject * object,
     case PROP_STD_COMPLIANCE:
       g_value_set_enum (value, ffmpegdec->std_compliance);
       break;
+    case PROP_REQUIRE_KEYFRAME:
+      g_value_set_boolean (value, ffmpegdec->require_keyframe);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;

subprojects/gst-libav/ext/libav/gstavviddec.h

@@ -94,6 +94,9 @@ struct _GstFFMpegVidDec
   gint pool_height;
   enum AVPixelFormat pool_format;
   GstVideoInfo pool_info;
+
+  gboolean requiring_keyframe;
+  gboolean require_keyframe;
 };
 
 typedef struct _GstFFMpegVidDecClass GstFFMpegVidDecClass;

subprojects/gst-libav/ext/libav/gstavvidenc.c

@@ -932,7 +932,7 @@ gst_ffmpegvidenc_start (GstVideoEncoder * encoder)
     return FALSE;
   }
 
-  gst_video_encoder_set_min_pts (encoder, GST_SECOND * 60 * 60 * 1000);
+  gst_video_encoder_set_min_pts (encoder, 0);
 
   return TRUE;
 }

subprojects/gst-plugins-bad/ext/aes/meson.build

@@ -6,20 +6,22 @@ aes_sources = [
 ]
 
 aes_cargs = []
-aes_dep = dependency('openssl', version : '>= 1.1.0', required : get_option('aes'))
-if aes_dep.found()
+openssl_dep = dependency('openssl', version : '>= 1.1.0', required : get_option('aes'))
+if openssl_dep.found()
   aes_cargs += ['-DHAVE_OPENSSL']
 else
   subdir_done()
 endif
 
+winsock2_dep = cc.find_library('ws2_32', required : false)
+gst_aes_deps = [gstpbutils_dep, gstvideo_dep, openssl_dep, winsock2_dep, gio_dep, libm]
+
 gstaes = library('gstaes',
   aes_sources,
   c_args : gst_plugins_bad_args + aes_cargs,
   link_args : noseh_link_args,
   include_directories : [configinc],
-  dependencies : [gstpbutils_dep, gstvideo_dep,
-                  aes_dep, gio_dep, libm],
+  dependencies : gst_aes_deps,
   install : true,
   install_dir : plugins_install_dir,
 )