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
16 changes: 16 additions & 0 deletions docs/sphinx/reference-outputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,22 @@ Output Definition Structure (obs_output_info)
frame. Audio data will be correctly truncated down to the exact
audio sample according to that video frame timing.

- **OBS_OUTPUT_NO_INTERLEAVE** - Output does not want A/V interleaving.

When this capability flag is used, encoded packets are delivered as
soon as each encoder produces them, instead of being held until a
packet of the opposing type establishes a monotonic muxed order.
This is intended for transports that carry each elementary stream
independently and whose receiver synchronises from media
timestamps; a muxed container should not use it.

The output must then handle two things itself: video is no longer
gated on the first keyframe, so the first video packet may be a
delta frame, and packets arrive per encoder with no cross-type
ordering or timestamp offset normalisation.

Ignored unless both video and audio are present.

.. member:: const char *(*obs_output_info.get_name)(void *type_data)

Get the translated name of the output type.
Expand Down
10 changes: 10 additions & 0 deletions docs/sphinx/reference-services.rst
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,16 @@ Service Definition Structure

:return: The properties of the service

The frontend displays these properties in the *Service Options* group
of the Stream settings page. In that context ``get_properties`` is
called with *data* set to ``NULL`` and ``get_properties2`` is not
used. Properties named after settings owned by the Stream page
(``server``, ``key``, ``bearer_token``, ``use_auth``, ``username``,
``password``, ``service``, ``protocol``, ``using_custom_server`` and
``bwtest``) are removed before the group is displayed. The remaining
values are saved along with their defaults as explicit values, as
services do not have their defaults applied on creation.

.. member:: void (*obs_service_info.update)(void *data, obs_data_t *settings)

Updates the settings for this service.
Expand Down
1 change: 1 addition & 0 deletions frontend/data/locale/en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -1042,6 +1042,7 @@ Basic.Settings.Stream.WHIPSimulcastLabel="Simulcast"
Basic.Settings.Stream.WHIPSimulcastInfo="Simulcast allows you to encode and send multiple video qualities. <a href='https://obsproject.com/kb/whip-streaming-guide'>Learn More</a>"
Basic.Settings.Stream.WHIPSimulcastTotalLayers="Total Layers"
Basic.Settings.Stream.AdvancedOptions="Advanced Options"
Basic.Settings.Stream.ServiceOptions="Service Options"

# basic mode 'output' settings
Basic.Settings.Output="Output"
Expand Down
21 changes: 21 additions & 0 deletions frontend/forms/OBSBasicSettings.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,27 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="servicePropertiesGroupBox">
<property name="title">
<string>Basic.Settings.Stream.ServiceOptions</string>
</property>
<layout class="QVBoxLayout" name="servicePropertiesLayout">
<property name="leftMargin">
<number>8</number>
</property>
<property name="topMargin">
<number>2</number>
</property>
<property name="rightMargin">
<number>8</number>
</property>
<property name="bottomMargin">
<number>8</number>
</property>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="multitrackVideoGroupBox">
<property name="title">
Expand Down
44 changes: 43 additions & 1 deletion frontend/settings/OBSBasicSettings.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,39 @@ struct OBSTheme;

std::string DeserializeConfigText(const char *value);

// Structured data for service dropdown items
struct ServiceItemData {
enum class Type {
Custom, // rtmp_custom service
ShowAll, // "Show All" option in dropdown
RtmpCommon, // Standard rtmp_common service (Twitch, YouTube, etc.)
CustomServiceType // Custom service types (WHIP, MoQ, etc.)
};

Type type;
QString serviceId; // Service ID: for RtmpCommon this is the service name,
// for CustomServiceType this is the service type ID (e.g., "whip_custom")
QString displayName; // Human-readable display name

ServiceItemData() : type(Type::Custom) {}

ServiceItemData(Type t, const QString &id = QString(), const QString &name = QString())
: type(t),
serviceId(id),
displayName(name)
{
}

// Helper methods for easy type checking
bool isCustom() const { return type == Type::Custom; }
bool isShowAll() const { return type == Type::ShowAll; }
bool isRtmpCommon() const { return type == Type::RtmpCommon; }
bool isCustomServiceType() const { return type == Type::CustomServiceType; }
};

// Register with Qt's meta-type system so it can be stored in QVariant
Q_DECLARE_METATYPE(ServiceItemData)

class OBSBasicSettings : public QDialog {
Q_OBJECT
Q_PROPERTY(QIcon generalIcon READ GetGeneralIcon WRITE SetGeneralIcon DESIGNABLE true)
Expand Down Expand Up @@ -87,7 +120,9 @@ class OBSBasicSettings : public QDialog {

std::vector<FFmpegFormat> formats;

OBSPropertiesView *streamProperties = nullptr;
OBSPropertiesView *servicePropertiesView = nullptr;
QString servicePropertiesId;

OBSPropertiesView *streamEncoderProps = nullptr;
OBSPropertiesView *recordEncoderProps = nullptr;

Expand Down Expand Up @@ -204,8 +239,15 @@ class OBSBasicSettings : public QDialog {
/* stream */
void InitStreamPage();
bool IsCustomService() const;
bool IsCustomServiceType() const;
QString GetCustomServiceTypeId() const;
inline bool IsWHIP() const;
int FindService(const std::function<bool(const ServiceItemData &)> &predicate);
void LoadServices(bool showAll);
void LoadServicePropertiesView();
void ClearServicePropertiesView();
OBSData SeedServicePropertiesSettings(const char *serviceId) const;
void MergeServiceProperties(obs_data_t *settings);
void OnOAuthStreamKeyConnected();
void OnAuthConnected();
QString lastService;
Expand Down
Loading
Loading