Skip to content

moq-dev: WIP master branch #7

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

Closed
emilsas wants to merge 4 commits into from
Closed

moq-dev: WIP master branch #7

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ccbf8c6
Merge pull request #1 from kixelated/hang-lib
kixelated Dec 9, 2025
62a4fee
Avoid spamming errors when track init fails.
kixelated Dec 10, 2025
5d220ef
Merge pull request #2 from moq-dev/avoid-spam
kixelated Dec 10, 2025
3c0cdb1
Merge branch 'qualabs:master' into master
kixelated Dec 12, 2025
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
47 changes: 36 additions & 11 deletions src/moq-output.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ MoQOutput::MoQOutput(obs_data_t *, obs_output_t *output)
path(),
total_bytes_sent(0),
connect_time_ms(0),
session(-1),
video(-1),
audio(-1),
session(0),
video(0),
audio(0),
broadcast(moq_broadcast_create())
{
}
Expand Down Expand Up @@ -106,9 +106,17 @@ bool MoQOutput::Start()
void MoQOutput::Stop(bool signal)
{
// Close the session
moq_session_close(session);
moq_track_close(video);
moq_track_close(audio);
if (session > 0) {
moq_session_close(session);
}

if (video > 0) {
moq_track_close(video);
}

if (audio > 0) {
moq_track_close(audio);
}

if (signal) {
obs_output_signal_stop(output, OBS_OUTPUT_SUCCESS);
Expand All @@ -134,24 +142,40 @@ void MoQOutput::Data(struct encoder_packet *packet)

void MoQOutput::AudioData(struct encoder_packet *packet)
{
if (audio < 0) {
if (audio == 0) {
AudioInit();
}

auto result = moq_track_write(audio, packet->data, packet->size, packet->pts);
if (audio < 0) {
// We failed to initialize the audio track, so we can't write any data.
return;
}

auto pts = util_mul_div64(
packet->pts,
1000000ULL * packet->timebase_num,
packet->timebase_den
);

auto result = moq_track_write(audio, packet->data, packet->size, pts);
if (result < 0) {
LOG_ERROR("Failed to write audio frame: %d", result);
return;
}

total_bytes_sent += packet->size;
}

void MoQOutput::VideoData(struct encoder_packet *packet)
{
if (video < 0) {
if (video == 0) {
VideoInit();
}

//auto pts = 1000000 * (packet->timebase_num * packet->pts) / packet->timebase_den;
if (video < 0) {
return;
}

auto pts = util_mul_div64(
packet->pts,
1000000ULL * packet->timebase_num,
Expand All @@ -160,9 +184,10 @@ void MoQOutput::VideoData(struct encoder_packet *packet)

auto result = moq_track_write(video, packet->data, packet->size, pts);
if (result < 0) {
LOG_ERROR("Failed to write video packet: %d", result);
LOG_ERROR("Failed to write video frame: %d", result);
return;
}

total_bytes_sent += packet->size;
}

Expand Down
Loading