New upstream version 22.0.3+dfsg1

docs/sphinx/reference-core.rst

@@ -433,6 +433,18 @@ Video, Audio, and Graphics
    Adds/removes a main rendering callback.  Allows custom rendering to
    the main stream/recording output.
 
+---------------------
+
+.. function:: void obs_add_raw_video_callback(const struct video_scale_info *conversion, void (*callback)(void *param, struct video_data *frame), void *param)
+              void obs_remove_raw_video_callback(void (*callback)(void *param, struct video_data *frame), void *param)
+
+   Adds/removes a raw video callback.  Allows the ability to obtain raw
+   video frames without necessarily using an output.
+
+   :param conversion: Specifies conversion requirements.  Can be NULL.
+   :param callback:   The callback that receives raw video frames.
+   :param param:      The private data associated with the callback.
+
 
 Primary signal/procedure handlers
 ---------------------------------

docs/sphinx/reference-encoders.rst

@@ -407,6 +407,7 @@ General Encoder Functions
 ---------------------
 
 .. function:: obs_data_t *obs_encoder_defaults(const char *id)
+              obs_data_t *obs_encoder_get_defaults(const obs_encoder_t *encoder)
 
    :return: An incremented reference to the encoder's default settings
 

docs/sphinx/reference-libobs-callback.rst

@@ -196,6 +196,18 @@ Signals are used for all event-based callbacks.
 
 ---------------------
 
+.. function:: void signal_handler_connect_ref(signal_handler_t *handler, const char *signal, signal_callback_t callback, void *data)
+
+   Connect a callback to a signal on a signal handler, and increments
+   the handler's internal reference counter, preventing it from being
+   destroyed until the signal has been disconnected.
+
+   :param handler:  Signal handler object
+   :param callback: Signal callback
+   :param data:     Private data passed the callback
+
+---------------------
+
 .. function:: void signal_handler_disconnect(signal_handler_t *handler, const char *signal, signal_callback_t callback, void *data)
 
    Disconnects a callback from a signal on a signal handler.

docs/sphinx/reference-outputs.rst

@@ -586,6 +586,13 @@ General Output Functions
 
 ---------------------
 
+.. function:: uint32_t obs_output_get_flags(const obs_output_t *output)
+              uint32_t obs_get_output_flags(const char *id)
+
+   :return: The output capability flags
+
+---------------------
+
 Functions used by outputs
 -------------------------
 

docs/sphinx/reference-scenes.rst

@@ -101,6 +101,23 @@ Scene Item Crop Structure (obs_sceneitem_crop)
    Bottom crop value.
 
 
+Scene Item Order Info Structure (*obs_sceneitem_order_info)
+----------------------------------------------
+
+.. type:: struct obs_sceneitem_order_info
+
+   Scene item order info structure.
+
+.. member:: obs_sceneitem_t *obs_sceneitem_order_info.group
+
+   Specifies the group this scene item belongs to, or *NULL* if none.
+
+.. member:: obs_sceneitem_t *obs_sceneitem_order_info.item
+
+   Specifies the scene item.
+
+
+
 .. _scene_signal_reference:
 
 Scene Signals
@@ -223,6 +240,12 @@ General Scene Functions
 
 ---------------------
 
+.. function:: bool obs_scene_reorder_items2(obs_scene_t *scene, struct obs_sceneitem_order_info *item_order, size_t item_order_size)
+
+   Reorders items within a scene with groups and group sub-items.
+
+---------------------
+
 
 .. _scene_item_reference:
 
@@ -412,3 +435,119 @@ Scene Item Functions
    :return: An incremented reference to the private settings of the
             scene item.  Allows the front-end to set custom information
             which is saved with the scene item
+
+---------------------
+
+
+.. _scene_item_group_reference:
+
+Scene Item Group Functions
+--------------------------
+
+.. function:: obs_sceneitem_t *obs_scene_add_group(obs_scene_t *scene, const char *name)
+
+   Adds a group with the specified name.
+
+   :param scene: Scene to add the group to
+   :param name:  Name of the group
+   :return:      The new group's scene item
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene, const char *name, obs_sceneitem_t **items, size_t count)
+
+   Creates a group out of the specified scene items.  The group will be
+   inserted at the top scene item.
+
+   :param scene: Scene to add the group to
+   :param name:  Name of the group
+   :param items: Array of scene items to put in a group
+   :param count: Number of scene items in the array
+   :return:      The new group's scene item
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_scene_get_group(obs_scene_t *scene, const char *name)
+
+   Finds a group within a scene by its name.
+
+   :param scene: Scene to find the group within
+   :param name:  The name of the group to find
+   :return:      The group scene item, or *NULL* if not found
+
+---------------------
+
+.. function:: bool obs_sceneitem_is_group(obs_sceneitem_t *item)
+
+   :param item: Scene item
+   :return:     *true* if scene item is a group, *false* otherwise
+
+---------------------
+
+.. function:: obs_scene_t *obs_sceneitem_group_get_scene(const obs_sceneitem_t *group)
+
+   :param group: Group scene item
+   :return:      Scene of the group, or *NULL* if not a group
+
+---------------------
+
+.. function:: void obs_sceneitem_group_ungroup(obs_sceneitem_t *group)
+
+   Ungroups the specified group.  Scene items within the group will be
+   placed where the group was.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_add_item(obs_sceneitem_t *group, obs_sceneitem_t *item)
+
+   Adds a scene item to a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_remove_item(obs_sceneitem_t *item)
+
+   Rmoves a scene item from a group.  The item will be placed before the
+   group in the main scene.
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_get_group(obs_sceneitem_t *item)
+
+   Returns the parent group of a scene item.
+
+   :param item: Scene item to get the group of
+   :return:     The parent group of the scene item, or *NULL* if not in
+                a group
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_group_from_scene(obs_scene_t *scene)
+
+   :return: The group associated with the scene, or *NULL* if the
+            specified scene is not a group.
+
+---------------------
+
+.. function:: obs_sceneitem_t *obs_sceneitem_group_from_source(obs_source_t *source)
+
+   :return: The group associated with the scene's source, or *NULL* if
+            the specified source is not a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_group_enum_items(obs_sceneitem_t *group, bool (*callback)(obs_scene_t*, obs_sceneitem_t*, void*), void *param)
+
+   Enumerates scene items within a group.
+
+---------------------
+
+.. function:: void obs_sceneitem_defer_group_resize_begin(obs_sceneitem_t *item)
+.. function:: void obs_sceneitem_defer_group_resize_end(obs_sceneitem_t *item)
+
+   Allows the ability to call any one of the transform functions on
+   scene items within a group without updating the internal matrices of
+   the group until obs_sceneitem_defer_group_resize_end has been called.
+
+   This is necessary if the user is resizing items while they are within
+   a group, as the group's transform will automatically update its
+   transform every frame otherwise.

docs/sphinx/scripting.rst

@@ -144,7 +144,7 @@ and define its keys the same way you would define an
             return "My Source"
     end
 
-    info.create = function(source, settings)
+    info.create = function(settings, source)
             -- typically source data would be stored as a table
             local my_source_data = {}