mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-05-18 21:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

libobs: Support format/space/range conversion in encoder GPU scaling

Browse Source
This commit is contained in:
Dennis Sädtler
2024-10-01 15:13:51 +02:00
committed by Ryan Foster
parent 0d6cf088ef
commit 2de0037e40
3 changed files with 83 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
libobs/obs-encoder.c
View File

@@ -203,18 +203,27 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
bool create_mix = true;
struct obs_video_info ovi;
const struct video_output_info *info;
uint32_t width;
uint32_t height;
enum video_format format;
enum video_colorspace space;
enum video_range_type range;
if (!encoder->media)
return;
info = video_output_get_info(encoder->media);
if (encoder->gpu_scale_type == OBS_SCALE_DISABLE)
return;
if (!encoder->scaled_height && !encoder->scaled_width)
if (!encoder->scaled_height && !encoder->scaled_width && encoder->preferred_format == VIDEO_FORMAT_NONE &&
encoder->preferred_space == VIDEO_CS_DEFAULT && encoder->preferred_range == VIDEO_RANGE_DEFAULT)
return;
info = video_output_get_info(encoder->media);
width = encoder->scaled_width ? encoder->scaled_width : info->width;
height = encoder->scaled_height ? encoder->scaled_height : info->height;
format = encoder->preferred_format != VIDEO_FORMAT_NONE ? encoder->preferred_format : info->format;
space = encoder->preferred_space != VIDEO_CS_DEFAULT ? encoder->preferred_space : info->colorspace;
range = encoder->preferred_range != VIDEO_RANGE_DEFAULT ? encoder->preferred_range : info->range;
current_mix = get_mix_for_video(encoder->media);
if (!current_mix)
return;
@@ -226,10 +235,13 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
if (current_mix->view != current->view)
continue;
if (voi->width != encoder->scaled_width || voi->height != encoder->scaled_height)
if (current->ovi.scale_type != encoder->gpu_scale_type)
continue;
if (voi->format != info->format || voi->colorspace != info->colorspace || voi->range != info->range)
if (voi->width != width || voi->height != height)
continue;
if (voi->format != format || voi->colorspace != space || voi->range != range)
continue;
current->encoder_refs += 1;
@@ -245,12 +257,12 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
ovi = current_mix->ovi;
ovi.output_format = info->format;
ovi.colorspace = info->colorspace;
ovi.range = info->range;
ovi.output_format = format;
ovi.colorspace = space;
ovi.range = range;
ovi.output_height = encoder->scaled_height;
ovi.output_width = encoder->scaled_width;
ovi.output_height = height;
ovi.output_width = width;
ovi.scale_type = encoder->gpu_scale_type;
ovi.gpu_conversion = true;
@@ -272,10 +284,13 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
if (current->view != current_mix->view)
continue;
if (voi->width != encoder->scaled_width || voi->height != encoder->scaled_height)
if (current->ovi.scale_type != encoder->gpu_scale_type)
continue;
if (voi->format != info->format || voi->colorspace != info->colorspace || voi->range != info->range)
if (voi->width != width || voi->height != height)
continue;
if (voi->format != format || voi->colorspace != space || voi->range != range)
continue;
obs_encoder_set_video(encoder, current->video);
@@ -1776,6 +1791,38 @@ enum video_format obs_encoder_get_preferred_video_format(const obs_encoder_t *en
return encoder->preferred_format;
}
void obs_encoder_set_preferred_color_space(obs_encoder_t *encoder, enum video_colorspace colorspace)
{
if (!encoder || encoder->info.type != OBS_ENCODER_VIDEO)
return;
encoder->preferred_space = colorspace;
}
enum video_colorspace obs_encoder_get_preferred_color_space(const obs_encoder_t *encoder)
{
if (!encoder || encoder->info.type != OBS_ENCODER_VIDEO)
return VIDEO_CS_DEFAULT;
return encoder->preferred_space;
}
void obs_encoder_set_preferred_range(obs_encoder_t *encoder, enum video_range_type range)
{
if (!encoder || encoder->info.type != OBS_ENCODER_VIDEO)
return;
encoder->preferred_range = range;
}
enum video_range_type obs_encoder_get_preferred_range(const obs_encoder_t *encoder)
{
if (!encoder || encoder->info.type != OBS_ENCODER_VIDEO)
return VIDEO_RANGE_DEFAULT;
return encoder->preferred_range;
}
void obs_encoder_release(obs_encoder_t *encoder)
{
if (!encoder)
@@ -2069,8 +2116,7 @@ void obs_encoder_group_destroy(obs_encoder_group_t *group)
obs_encoder_group_actually_destroy(group);
}
bool obs_encoder_video_tex_active(const obs_encoder_t *encoder,
enum video_format format)
bool obs_encoder_video_tex_active(const obs_encoder_t *encoder, enum video_format format)
{
struct obs_core_video_mix *mix = get_mix_for_video(encoder->media);

2
libobs/obs-internal.h
View File

@@ -1239,6 +1239,8 @@ struct obs_encoder {
uint32_t scaled_width;
uint32_t scaled_height;
enum video_format preferred_format;
enum video_colorspace preferred_space;
enum video_range_type preferred_range;
volatile bool active;
volatile bool paused;

19
libobs/obs.h
View File

@@ -2252,10 +2252,29 @@ EXPORT size_t obs_encoder_get_mixer_index(const obs_encoder_t *encoder);
*
* If the format is set to VIDEO_FORMAT_NONE, will revert to the default
* functionality of converting only when absolutely necessary.
*
* If GPU scaling is enabled, conversion will happen on the GPU.
*/
EXPORT void obs_encoder_set_preferred_video_format(obs_encoder_t *encoder, enum video_format format);
EXPORT enum video_format obs_encoder_get_preferred_video_format(const obs_encoder_t *encoder);
/**
* Sets the preferred colorspace for an encoder, e.g., to simultaneous SDR and
* HDR output.
*
* Only supported when GPU scaling is enabled.
*/
EXPORT void obs_encoder_set_preferred_color_space(obs_encoder_t *encoder, enum video_colorspace colorspace);
EXPORT enum video_colorspace obs_encoder_get_preferred_color_space(const obs_encoder_t *encoder);
/**
* Sets the preferred range for an encoder.
*
* Only supported when GPU scaling is enabled.
*/
EXPORT void obs_encoder_set_preferred_range(obs_encoder_t *encoder, enum video_range_type range);
EXPORT enum video_range_type obs_encoder_get_preferred_range(const obs_encoder_t *encoder);
/** 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);