Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions libobs/build/libobs.core+.h.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include "libobs/build/libobs.pch.h"

#include "libobs/obs-audio-info-queries.c.h"
#include "libobs/obs-base-effect-fields.c.h"
#include "libobs/obs-core-cmdline-fields.c.h"
#include "libobs/obs-core-frame-interval-fields.c.h"
Expand Down Expand Up @@ -56,6 +57,7 @@
#include "libobs/obs-ui-task-handler-fields.c.h"
#include "libobs/obs-video-info-query-fields.c.h"
#include "libobs/obs-video-level-queries.c.h"
#include "libobs/obs-video-stats-queries.c.h"
#include "libobs/obs-weak-object-expired-fields.c.h"
#include "libobs/obs-weak-object-identity-fields.c.h"
#include "libobs/obs-weak-object-refs-fields.c.h"
Expand Down
41 changes: 41 additions & 0 deletions libobs/obs-audio-info-queries.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#include "libobs/build/libobs.pch.h"

bool obs_get_audio_info(struct obs_audio_info *oai)
{
/* no core (before obs_startup): no audio (#2566) */
if (!obs)
return false;

struct obs_core_audio *audio = &obs->audio;
const struct audio_output_info *info;

if (!oai || !audio->audio)
return false;

info = audio_output_get_info(audio->audio);

oai->samples_per_sec = info->samples_per_sec;
oai->speakers = info->speakers;
return true;
}

bool obs_get_audio_info2(struct obs_audio_info2 *oai2)
{
/* no core (before obs_startup): no audio (#3363) */
if (!obs)
return false;

struct obs_core_audio *audio = &obs->audio;
struct obs_audio_info oai;

if (!obs_get_audio_info(&oai) || !oai2 || !audio->audio) {
return false;
} else {
oai2->samples_per_sec = oai.samples_per_sec;
oai2->speakers = oai.speakers;
oai2->fixed_buffering = audio->fixed_buffer;
oai2->max_buffering_ms =
(uint32_t)obs_core_setup_rules_buffer_ms(audio->max_buffering_ticks, oai2->samples_per_sec);
return true;
}
}
26 changes: 26 additions & 0 deletions libobs/obs-video-stats-queries.c.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include "libobs/build/libobs.pch.h"

uint64_t obs_get_video_frame_time(void)
{
return obs_video_stats_frame_time(&obs->video.stats);
}

double obs_get_active_fps(void)
{
return obs_video_stats_fps(&obs->video.stats);
}

uint64_t obs_get_average_frame_time_ns(void)
{
return obs_video_stats_avg_frame_time_ns(&obs->video.stats);
}

uint32_t obs_get_total_frames(void)
{
return obs_video_stats_total_frames(&obs->video.stats);
}

uint32_t obs_get_lagged_frames(void)
{
return obs_video_stats_lagged_frames(&obs->video.stats);
}
65 changes: 0 additions & 65 deletions libobs/obs.c.h
Original file line number Diff line number Diff line change
Expand Up @@ -1703,46 +1703,6 @@ void obs_set_video_levels(float sdr_white_level, float hdr_nominal_peak_level)
(double)hdr_nominal_peak_level, (double)video->hdr_nominal_peak_level);
}

bool obs_get_audio_info(struct obs_audio_info *oai)
{
/* no core (before obs_startup): no audio (#2566) */
if (!obs)
return false;

struct obs_core_audio *audio = &obs->audio;
const struct audio_output_info *info;

if (!oai || !audio->audio)
return false;

info = audio_output_get_info(audio->audio);

oai->samples_per_sec = info->samples_per_sec;
oai->speakers = info->speakers;
return true;
}

bool obs_get_audio_info2(struct obs_audio_info2 *oai2)
{
/* no core (before obs_startup): no audio (#3363) */
if (!obs)
return false;

struct obs_core_audio *audio = &obs->audio;
struct obs_audio_info oai;

if (!obs_get_audio_info(&oai) || !oai2 || !audio->audio) {
return false;
} else {
oai2->samples_per_sec = oai.samples_per_sec;
oai2->speakers = oai.speakers;
oai2->fixed_buffering = audio->fixed_buffer;
oai2->max_buffering_ms =
(uint32_t)obs_core_setup_rules_buffer_ms(audio->max_buffering_ticks, oai2->samples_per_sec);
return true;
}
}

const char *obs_get_latest_input_type_id(const char *unversioned_id)
{
struct obs_source_info *latest = NULL;
Expand Down Expand Up @@ -2852,21 +2812,6 @@ profiler_name_store_t *obs_get_profiler_name_store(void)
return obs->name_store;
}

uint64_t obs_get_video_frame_time(void)
{
return obs_video_stats_frame_time(&obs->video.stats);
}

double obs_get_active_fps(void)
{
return obs_video_stats_fps(&obs->video.stats);
}

uint64_t obs_get_average_frame_time_ns(void)
{
return obs_video_stats_avg_frame_time_ns(&obs->video.stats);
}

void *obs_obj_get_data(void *obj)
{
struct obs_context_data *context = obj;
Expand Down Expand Up @@ -2937,16 +2882,6 @@ bool obs_set_audio_monitoring_device(const char *name, const char *id)
return true;
}

uint32_t obs_get_total_frames(void)
{
return obs_video_stats_total_frames(&obs->video.stats);
}

uint32_t obs_get_lagged_frames(void)
{
return obs_video_stats_lagged_frames(&obs->video.stats);
}

/* An encoder that rescales on the GPU encodes from an encoder-only mix of
* the same view (maybe_set_up_gpu_rescale() in obs-encoder.c), and that
* mix's video_t counts its frames. The mixes are read under mixes_mutex: an
Expand Down
60 changes: 60 additions & 0 deletions test/cmocka/build/test-graph.json
Original file line number Diff line number Diff line change
Expand Up @@ -641,6 +641,28 @@
"OBS::native-test-cmocka"
]
},
"test_audio_info_queries": {
"sources": [
"test/cmocka/test_audio_info_queries.c"
],
"includes": [
"libobs",
"deps/libcaption"
],
"libraries": [
"OBS::libobs",
"OBS::caption",
"Uthash::Uthash",
"OBS::native-test-cmocka",
{
"name": "OBS::w32-pthreads",
"requires": "OS_WINDOWS"
}
],
"watch_inputs": [
"libobs/obs-audio-info-queries.c.h"
]
},
"test_audio_io_inlines": {
"sources": [
"test/cmocka/test_audio_io_inlines.c"
Expand Down Expand Up @@ -19822,6 +19844,28 @@
],
"sanitizers": "address,undefined"
},
"test_video_stats_queries": {
"sources": [
"test/cmocka/test_video_stats_queries.c"
],
"includes": [
"libobs",
"deps/libcaption"
],
"libraries": [
"OBS::libobs",
"OBS::caption",
"Uthash::Uthash",
"OBS::native-test-cmocka",
{
"name": "OBS::w32-pthreads",
"requires": "OS_WINDOWS"
}
],
"watch_inputs": [
"libobs/obs-video-stats-queries.c.h"
]
},
"test_video_stats_race": {
"sources": [
"test/cmocka/test_video_stats_race.c"
Expand Down Expand Up @@ -21591,6 +21635,14 @@
]
]
},
"test_audio_info_queries": {
"target": "test_audio_info_queries",
"command": [
"${target}"
],
"suite": "core",
"timeout_seconds": 30
},
"test_audio_io_inlines": {
"target": "test_audio_io_inlines",
"command": [
Expand Down Expand Up @@ -28291,6 +28343,14 @@
"${target}"
]
},
"test_video_stats_queries": {
"target": "test_video_stats_queries",
"command": [
"${target}"
],
"suite": "core",
"timeout_seconds": 30
},
"test_video_stats_race": {
"target": "test_video_stats_race"
},
Expand Down
Loading
Loading