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
4 changes: 4 additions & 0 deletions cpp/moq/include/moq/moq.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ using JsonStreamConsumer = MoqJsonStreamConsumer;
using JsonStreamProducer = MoqJsonStreamProducer;
using MediaCatalogConsumer = MoqMediaCatalogConsumer;
using MediaCatalogProducer = MoqMediaCatalogProducer;
/// Shares one source timestamp offset without keeping its broadcast open.
using MediaTimebase = MoqMediaTimebase;
using MediaTrackConsumer = MoqMediaTrackConsumer;
using MediaGroupConsumer = MoqMediaGroupConsumer;
using MediaContainerProducer = MoqMediaContainerProducer;
Expand Down Expand Up @@ -104,6 +106,8 @@ using ClientConfig = MoqClientConfig;
using ClientTls = MoqClientTls;
using ConnectionStats = MoqConnectionStats;
using ContainerInit = MoqContainerInit;
/// A byte-stream container format and an optional shared source timebase.
using ContainerStreamInit = MoqContainerStreamInit;
using Datagram = MoqDatagram;
using Dimensions = MoqDimensions;
using FetchGroupOptions = MoqFetchGroupOptions;
Expand Down
13 changes: 13 additions & 0 deletions cpp/moq/test/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,19 @@ Coroutine read_one(std::shared_ptr<moq::TrackConsumer> consumer, std::optional<m
} // namespace

int main() {
auto timebase_owner = ok(moq::BroadcastProducer::init(), "timebase owner");
auto timebase_other = ok(moq::BroadcastProducer::init(), "timebase other");
auto timebase = ok(moq::MediaTimebase::init(timebase_owner), "timebase");
auto foreign_chunks = moq::MediaContainerProducer::init(timebase_other, {moq::ContainerFormat::kFmp4, {}, timebase});
CHECK(!foreign_chunks);
CHECK(std::holds_alternative<moq::Error::kCodec>(foreign_chunks.error().get_variant()));
auto foreign_stream = moq::MediaContainerStreamProducer::init(timebase_other, {moq::ContainerFormat::kFmp4, timebase});
CHECK(!foreign_stream);
CHECK(std::holds_alternative<moq::Error::kCodec>(foreign_stream.error().get_variant()));
ok(timebase_owner->close(), "close timebase owner");
CHECK(!moq::MediaTimebase::init(timebase_owner));
ok(timebase_other->close(), "close timebase other");

// A synchronous error is a returned value, not an exception.
auto unbound = ok(moq::Server::init({}), "server init");
auto fingerprints = unbound->cert_fingerprints();
Expand Down
8 changes: 7 additions & 1 deletion dart/moq/lib/media.dart
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ typedef AudioFormat = MoqAudioFormat;
/// A container that publishes its own tracks.
typedef ContainerFormat = MoqContainerFormat;

/// A container format and its leading bytes.
/// A shared source timestamp offset that does not keep its broadcast open.
typedef Timebase = MoqMediaTimebase;

/// A byte-stream container format and an optional shared source timebase.
typedef ContainerStreamInit = MoqContainerStreamInit;

/// A container format, its leading bytes, and an optional shared source timebase.
typedef ContainerInit = MoqContainerInit;

/// A width and height pair, in pixels.
Expand Down
33 changes: 33 additions & 0 deletions dart/moq/test/moq_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,39 @@ Future<AnnounceEvent> nextRoute(AnnounceConsumer announced) async {
}

void main() {
test('container timebase belongs to one broadcast', () {
final owner = BroadcastProducer();
final other = BroadcastProducer();
final timebase = moq_media.Timebase(broadcast: owner);
expect(
() => moq_media.ContainerProducer(
broadcast: other,
init: moq_media.ContainerInit(
format: moq_media.ContainerFormat.fmp4,
data: Uint8List(0),
timebase: timebase,
),
),
throwsA(isA<CodecMoqException>()),
);
expect(
() => moq_media.ContainerStreamProducer(
broadcast: other,
init: moq_media.ContainerStreamInit(
format: moq_media.ContainerFormat.fmp4,
timebase: timebase,
),
),
throwsA(isA<CodecMoqException>()),
);
owner.close();
expect(
() => moq_media.Timebase(broadcast: owner),
throwsA(isA<ClosedMoqException>()),
);
other.close();
});

test('diagnostic errors expose their named reason', () {
final error = TransportMoqException('reset');
expect(error.reason, 'reset');
Expand Down
Loading
Loading