New upstream version 22.0.3+dfsg1

This commit is contained in:
Sebastian Ramacher 2018-12-16 17:14:58 +01:00
parent 665f64a933
commit cdc9a9fc87
334 changed files with 14525 additions and 2639 deletions

View file

@ -242,6 +242,32 @@ struct obs_source_frame {
/* ------------------------------------------------------------------------- */
/* OBS context */
/**
* Find a core libobs data file
* @param path name of the base file
* @return A string containing the full path to the file.
* Use bfree after use.
*/
EXPORT char *obs_find_data_file(const char *file);
/**
* Add a path to search libobs data files in.
* @param path Full path to directory to look in.
* The string is copied.
*/
EXPORT void obs_add_data_path(const char *path);
/**
* Remove a path from libobs core data paths.
* @param path The path to compare to currently set paths.
* It does not need to be the same pointer, but
* the path string must match an entry fully.
* @return Whether or not the path was successfully removed.
* If false, the path could not be found.
*/
EXPORT bool obs_remove_data_path(const char *path);
/**
* Initializes OBS
*
@ -276,6 +302,12 @@ EXPORT void obs_set_locale(const char *locale);
/** @return the current locale */
EXPORT const char *obs_get_locale(void);
/** Initialize the Windows-specific crash handler */
#ifdef _WIN32
EXPORT void obs_init_win32_crash_handler(void);
#endif
/**
* Returns the profiler name store (see util/profiler.h) used by OBS, which is
* either a name store passed to obs_startup, an internal name store, or NULL
@ -564,6 +596,10 @@ EXPORT void obs_render_main_view(void);
/** Renders the last main output texture */
EXPORT void obs_render_main_texture(void);
/** Returns the last main output texture. This can return NULL if the texture
* is unavailable. */
EXPORT gs_texture_t *obs_get_main_texture(void);
/** Sets the master user volume */
EXPORT void obs_set_master_volume(float volume);
@ -576,6 +612,12 @@ EXPORT obs_data_t *obs_save_source(obs_source_t *source);
/** Loads a source from settings data */
EXPORT obs_source_t *obs_load_source(obs_data_t *data);
/** Send a save signal to sources */
EXPORT void obs_source_save(obs_source_t *source);
/** Send a load signal to sources */
EXPORT void obs_source_load(obs_source_t *source);
typedef void (*obs_load_source_cb)(void *private_data, obs_source_t *source);
/** Loads sources from a data array */
@ -624,6 +666,26 @@ EXPORT void obs_remove_main_render_callback(
void (*draw)(void *param, uint32_t cx, uint32_t cy),
void *param);
EXPORT void obs_add_raw_video_callback(
const struct video_scale_info *conversion,
void (*callback)(void *param, struct video_data *frame),
void *param);
EXPORT void obs_remove_raw_video_callback(
void (*callback)(void *param, struct video_data *frame),
void *param);
EXPORT uint64_t obs_get_video_frame_time(void);
EXPORT double obs_get_active_fps(void);
EXPORT uint64_t obs_get_average_frame_time_ns(void);
EXPORT uint32_t obs_get_total_frames(void);
EXPORT uint32_t obs_get_lagged_frames(void);
EXPORT void obs_apply_private_data(obs_data_t *settings);
EXPORT void obs_set_private_data(obs_data_t *settings);
EXPORT obs_data_t *obs_get_private_data(void);
/* ------------------------------------------------------------------------- */
/* View context */
@ -650,14 +712,6 @@ EXPORT obs_source_t *obs_view_get_source(obs_view_t *view,
/** Renders the sources of this view context */
EXPORT void obs_view_render(obs_view_t *view);
EXPORT uint64_t obs_get_video_frame_time(void);
EXPORT double obs_get_active_fps(void);
EXPORT uint64_t obs_get_average_frame_time_ns(void);
EXPORT uint32_t obs_get_total_frames(void);
EXPORT uint32_t obs_get_lagged_frames(void);
/* ------------------------------------------------------------------------- */
/* Display context */
@ -1275,6 +1329,15 @@ EXPORT void obs_scene_enum_items(obs_scene_t *scene,
EXPORT bool obs_scene_reorder_items(obs_scene_t *scene,
obs_sceneitem_t * const *item_order, size_t item_order_size);
struct obs_sceneitem_order_info {
obs_sceneitem_t *group;
obs_sceneitem_t *item;
};
EXPORT bool obs_scene_reorder_items2(obs_scene_t *scene,
struct obs_sceneitem_order_info *item_order,
size_t item_order_size);
/** Adds/creates a new scene item for a source */
EXPORT obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source);
@ -1364,6 +1427,8 @@ EXPORT void obs_sceneitem_set_scale_filter(obs_sceneitem_t *item,
EXPORT enum obs_scale_type obs_sceneitem_get_scale_filter(
obs_sceneitem_t *item);
EXPORT void obs_sceneitem_force_update_transform(obs_sceneitem_t *item);
EXPORT void obs_sceneitem_defer_update_begin(obs_sceneitem_t *item);
EXPORT void obs_sceneitem_defer_update_end(obs_sceneitem_t *item);
@ -1371,6 +1436,39 @@ EXPORT void obs_sceneitem_defer_update_end(obs_sceneitem_t *item);
* automatically. Returns an incremented reference. */
EXPORT obs_data_t *obs_sceneitem_get_private_settings(obs_sceneitem_t *item);
EXPORT obs_sceneitem_t *obs_scene_add_group(obs_scene_t *scene,
const char *name);
EXPORT obs_sceneitem_t *obs_scene_insert_group(obs_scene_t *scene,
const char *name, obs_sceneitem_t **items, size_t count);
EXPORT obs_sceneitem_t *obs_scene_get_group(obs_scene_t *scene,
const char *name);
EXPORT bool obs_sceneitem_is_group(obs_sceneitem_t *item);
EXPORT obs_scene_t *obs_sceneitem_group_get_scene(
const obs_sceneitem_t *group);
EXPORT void obs_sceneitem_group_ungroup(obs_sceneitem_t *group);
EXPORT void obs_sceneitem_group_add_item(obs_sceneitem_t *group,
obs_sceneitem_t *item);
EXPORT void obs_sceneitem_group_remove_item(obs_sceneitem_t *group,
obs_sceneitem_t *item);
EXPORT obs_sceneitem_t *obs_sceneitem_get_group(obs_scene_t *scene,
obs_sceneitem_t *item);
EXPORT bool obs_source_is_group(const obs_source_t *source);
EXPORT bool obs_scene_is_group(const obs_scene_t *scene);
EXPORT void obs_sceneitem_group_enum_items(obs_sceneitem_t *group,
bool (*callback)(obs_scene_t*, obs_sceneitem_t*, void*),
void *param);
EXPORT void obs_sceneitem_defer_group_resize_begin(obs_sceneitem_t *item);
EXPORT void obs_sceneitem_defer_group_resize_end(obs_sceneitem_t *item);
/* ------------------------------------------------------------------------- */
/* Outputs */
@ -1440,6 +1538,12 @@ EXPORT void obs_output_force_stop(obs_output_t *output);
/** Returns whether the output is active */
EXPORT bool obs_output_active(const obs_output_t *output);
/** Returns output capability flags */
EXPORT uint32_t obs_output_get_flags(const obs_output_t *output);
/** Returns output capability flags */
EXPORT uint32_t obs_get_output_flags(const char *id);
/** Gets the default settings for an output type */
EXPORT obs_data_t *obs_output_defaults(const char *id);
@ -1717,6 +1821,7 @@ EXPORT enum video_format obs_encoder_get_preferred_video_format(
/** Gets the default settings for an encoder type */
EXPORT obs_data_t *obs_encoder_defaults(const char *id);
EXPORT obs_data_t *obs_encoder_get_defaults(const obs_encoder_t *encoder);
/** Returns the property list, if any. Free with obs_properties_destroy */
EXPORT obs_properties_t *obs_get_encoder_properties(const char *id);
@ -1895,6 +2000,8 @@ static inline void obs_source_frame_destroy(struct obs_source_frame *frame)
}
}
EXPORT void obs_source_frame_copy(struct obs_source_frame *dst,
const struct obs_source_frame *src);
#ifdef __cplusplus
}