Skip to content

Fixed enhanced broadcasting encoders when using on high end GPU #694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
summeroff merged 2 commits into from
Jan 30, 2026
Merged

Fixed enhanced broadcasting encoders when using on high end GPU #694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1df24f1
Fixed enhanced broadcasting encoders when using on high end GPU with …
aleksandr-voitenko Jan 23, 2026
337b508
Added accessors for encoder color_space and range
aleksandr-voitenko Jan 23, 2026
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
102 changes: 68 additions & 34 deletions libobs/obs-encoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,37 +211,45 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
struct obs_core_video_mix *mix, *current_mix;
bool create_mix = true;
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;

pthread_mutex_lock(&obs->video.mixes_mutex);
for (size_t i = 0; i < obs->video.mixes.num; i++) {
struct obs_core_video_mix *current = obs->video.mixes.array[i];
const struct video_output_info *voi =
video_output_get_info(current->video);
const struct video_output_info *voi = video_output_get_info(current->video);
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->width != width || voi->height != height)
continue;

if (voi->format != info->format ||
voi->colorspace != info->colorspace ||
voi->range != info->range)
if (voi->format != format || voi->colorspace != space || voi->range != range)
continue;

current->encoder_refs += 1;
Expand All @@ -255,21 +263,15 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
if (!create_mix)
return;

if (!current_mix->ovi) {
blog(LOG_ERROR,
"maybe_set_up_gpu_rescale - no obs_video_info for current mix");
return;
}

struct obs_video_info *ovi = bzalloc(sizeof(struct obs_video_info));
*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;
Expand All @@ -287,19 +289,17 @@ static void maybe_set_up_gpu_rescale(struct obs_encoder *encoder)
// double check that nobody else added a matching mix while we've created our mix
for (size_t i = 0; i < obs->video.mixes.num; i++) {
struct obs_core_video_mix *current = obs->video.mixes.array[i];
const struct video_output_info *voi =
video_output_get_info(current->video);

const struct video_output_info *voi = video_output_get_info(current->video);
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->width != width || voi->height != height)
continue;

if (voi->format != info->format ||
voi->colorspace != info->colorspace ||
voi->range != info->range)
if (voi->format != format || voi->colorspace != space || voi->range != range)
continue;

obs_encoder_set_video(encoder, current->video);
Expand Down Expand Up @@ -630,7 +630,7 @@ static void intitialize_audio_encoder(struct obs_encoder *encoder)

static THREAD_LOCAL bool can_reroute = false;

static inline bool obs_encoder_initialize_internal(obs_encoder_t *encoder)
static bool obs_encoder_initialize_internal(obs_encoder_t *encoder)
{
if (!encoder->media) {
blog(LOG_ERROR,
Expand All @@ -657,10 +657,12 @@ static inline bool obs_encoder_initialize_internal(obs_encoder_t *encoder)
if (encoder->orig_info.create) {
can_reroute = true;
encoder->info = encoder->orig_info;

if (!encoder->video)
encoder->video = obs->video.main_mix;
encoder->context.data = encoder->orig_info.create(
encoder->context.settings, encoder);

encoder->context.data = encoder->orig_info.create(encoder->context.settings, encoder);

can_reroute = false;
}
if (!encoder->context.data)
Expand Down Expand Up @@ -1930,6 +1932,38 @@ obs_encoder_get_preferred_video_format(const obs_encoder_t *encoder)
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_addref(obs_encoder_t *encoder)
{
if (!encoder)
Expand Down
2 changes: 2 additions & 0 deletions libobs/obs-internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,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;
Expand Down
4 changes: 1 addition & 3 deletions libobs/obs-output.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ extern "C" {
(OBS_OUTPUT_MULTI_TRACK_AUDIO | OBS_OUTPUT_MULTI_TRACK_VIDEO)

#define MAX_OUTPUT_AUDIO_ENCODERS 6
#define MAX_OUTPUT_VIDEO_ENCODERS 6

#define MAX_OUTPUT_AUDIO_ENCODERS 6
#define MAX_OUTPUT_VIDEO_ENCODERS 10

// User flags
#define OBS_OUTPUT_FORCE_ENCODER (1 << 15)
Expand Down
17 changes: 17 additions & 0 deletions libobs/obs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2729,6 +2729,23 @@ EXPORT void obs_encoder_set_preferred_video_format(obs_encoder_t *encoder,
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);
Expand Down
Loading