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: 3 additions & 1 deletion cpp/moq/test/probe.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ int main() {
// Publisher: a server whose origin serves one broadcast with one track.
auto origin = moq::OriginProducer::init({});
auto broadcast = ok(origin->create_broadcast("probe"), "create_broadcast");
auto track = ok(broadcast->publish_track("data", std::nullopt), "publish_track");
moq::TrackInfo info;
info.timescale = 1000000;
auto track = ok(broadcast->publish_track("data", info), "publish_track");
ok(broadcast->announce({}), "announce");

moq::ServerConfig server_config;
Expand Down
13 changes: 13 additions & 0 deletions dart/moq/lib/flate.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/// Opaque snapshot and stream tracks, mirroring the moq-flate crate.
library;

import 'package:moq_ffi/moq_ffi.dart';

/// Publishes the latest opaque payload on a track it takes over.
typedef SnapshotProducer = MoqFlateSnapshotProducer;

/// Publishes an ordered opaque payload log on a track it takes over.
typedef StreamProducer = MoqFlateStreamProducer;

/// Configures compression and the opaque payload media type.
typedef Config = MoqFlateConfig;
53 changes: 52 additions & 1 deletion dart/moq/test/moq_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import 'dart:convert';
import 'dart:typed_data';

import 'package:moq/media.dart' as moq_media;
import 'package:moq/flate.dart' as moq_flate;
import 'package:moq/json.dart' as moq_json;
import 'package:moq/moq.dart';
import 'package:test/test.dart';
Expand All @@ -25,11 +26,58 @@ void main() {
final broadcast = BroadcastProducer();
final catalog = moq_media.CatalogProducer(broadcast: broadcast);
catalog.setSection(name: 'app', json: '{"value":42}');
catalog.now();
broadcast.close();
expect(
() => catalog.removeSection(name: 'app'),
throwsA(isA<ClosedMoqException>()),
);
expect(() => catalog.now(), throwsA(isA<ClosedMoqException>()));
});

for (final timestamp in <int?>[null, 123456]) {
for (final mode in ['snapshot', 'stream']) {
test('flate $mode preserves timestamp $timestamp', () async {
final broadcast = BroadcastProducer();
final info = timestamp == null ? null : TrackInfo(timescale: 1000000);
final track = broadcast.publishTrack(name: 'data', info: info);
final consumer = track.consume(subscription: null);
final payload = utf8.encode('payload');
if (mode == 'snapshot') {
final producer = moq_flate.SnapshotProducer(
broadcast: broadcast,
track: track,
config: moq_flate.Config(),
);
producer.update(payload: payload, timestampUs: timestamp);
producer.finish();
} else {
final producer = moq_flate.StreamProducer(
broadcast: broadcast,
track: track,
config: moq_flate.Config(),
);
producer.append(payload: payload, timestampUs: timestamp);
producer.finish();
}
final frame = await consumer.readFrame().timeout(timeout);
expect(frame?.payload, payload);
expect(frame?.timestampUs, timestamp);
broadcast.close();
});
}
}

test('raw writes without timestamps stay untimed', () async {
final broadcast = BroadcastProducer();
final track = broadcast.publishTrack(name: 'untimed', info: null);
final consumer = track.consume(subscription: null);
track.writeFrame(frame: Frame(payload: utf8.encode('payload')));
final frame = await consumer.readFrame().timeout(timeout);
expect(frame?.timestampUs, isNull);
expect(consumer.info().timescale, isNull);
track.finish();
broadcast.close();
});

test('connects, announces, subscribes, and delivers a frame', () async {
Expand Down Expand Up @@ -62,7 +110,10 @@ void main() {
(event) => event is AnnounceEventStart,
);
final broadcast = relay.createBroadcast(path: 'live');
final track = broadcast.publishTrack(name: 'events', info: null);
final track = broadcast.publishTrack(
name: 'events',
info: TrackInfo(timescale: 1000000),
);
broadcast.announce(route: MoqRoute());
final announced =
(await announcement.timeout(timeout) as AnnounceEventStart).announce;
Expand Down
90 changes: 62 additions & 28 deletions dart/moq_ffi/lib/src/moq.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5754,7 +5754,7 @@ class FfiConverterMoqTrackDemand {

abstract class MoqFlateSnapshotProducerInterface {
void finish();
void update({required Uint8List payload});
void update({required Uint8List payload, int? timestampUs = null});
}

final _MoqFlateSnapshotProducerFinalizer = Finalizer<Pointer<Void>>((ptr) {
Expand Down Expand Up @@ -5809,11 +5809,12 @@ class MoqFlateSnapshotProducer implements MoqFlateSnapshotProducerInterface {
}, moqExceptionErrorHandler);
}

void update({required Uint8List payload}) {
void update({required Uint8List payload, int? timestampUs = null}) {
return rustCall((status) {
uniffi_moq_ffi_fn_method_moqflatesnapshotproducer_update(
uniffiClonePointer(),
FfiConverterUint8List.lower(payload),
FfiConverterOptionalUInt64.lower(timestampUs),
status,
);
}, moqExceptionErrorHandler);
Expand Down Expand Up @@ -5847,7 +5848,7 @@ class FfiConverterMoqFlateSnapshotProducer {
}

abstract class MoqFlateStreamProducerInterface {
void append({required Uint8List payload});
void append({required Uint8List payload, int? timestampUs = null});
void finish();
}

Expand Down Expand Up @@ -5893,11 +5894,12 @@ class MoqFlateStreamProducer implements MoqFlateStreamProducerInterface {
);
}

void append({required Uint8List payload}) {
void append({required Uint8List payload, int? timestampUs = null}) {
return rustCall((status) {
uniffi_moq_ffi_fn_method_moqflatestreamproducer_append(
uniffiClonePointer(),
FfiConverterUint8List.lower(payload),
FfiConverterOptionalUInt64.lower(timestampUs),
status,
);
}, moqExceptionErrorHandler);
Expand Down Expand Up @@ -6036,7 +6038,7 @@ class FfiConverterMoqJsonSnapshotConsumer {
abstract class MoqJsonSnapshotProducerInterface {
MoqTrackDemand demand();
void finish();
void update({required String value});
void update({required String value, int? timestampUs = null});
}

final _MoqJsonSnapshotProducerFinalizer = Finalizer<Pointer<Void>>((ptr) {
Expand Down Expand Up @@ -6101,11 +6103,12 @@ class MoqJsonSnapshotProducer implements MoqJsonSnapshotProducerInterface {
}, moqExceptionErrorHandler);
}

void update({required String value}) {
void update({required String value, int? timestampUs = null}) {
return rustCall((status) {
uniffi_moq_ffi_fn_method_moqjsonsnapshotproducer_update(
uniffiClonePointer(),
FfiConverterString.lower(value),
FfiConverterOptionalUInt64.lower(timestampUs),
status,
);
}, moqExceptionErrorHandler);
Expand Down Expand Up @@ -6233,7 +6236,7 @@ class FfiConverterMoqJsonStreamConsumer {
}

abstract class MoqJsonStreamProducerInterface {
void append({required String value});
void append({required String value, int? timestampUs = null});
MoqTrackDemand demand();
void finish();
}
Expand Down Expand Up @@ -6280,11 +6283,12 @@ class MoqJsonStreamProducer implements MoqJsonStreamProducerInterface {
);
}

void append({required String value}) {
void append({required String value, int? timestampUs = null}) {
return rustCall((status) {
uniffi_moq_ffi_fn_method_moqjsonstreamproducer_append(
uniffiClonePointer(),
FfiConverterString.lower(value),
FfiConverterOptionalUInt64.lower(timestampUs),
status,
);
}, moqExceptionErrorHandler);
Expand Down Expand Up @@ -6435,6 +6439,7 @@ class FfiConverterMoqMediaCatalogConsumer {
}

abstract class MoqMediaCatalogProducerInterface {
int now();
void removeSection({required String name});
void setSection({required String name, required String json});
void setVideoProperties({required MoqVideoProperties properties});
Expand Down Expand Up @@ -6477,6 +6482,17 @@ class MoqMediaCatalogProducer implements MoqMediaCatalogProducerInterface {
);
}

int now() {
return rustCallWithLifter(
(status) => uniffi_moq_ffi_fn_method_moqmediacatalogproducer_now(
uniffiClonePointer(),
status,
),
FfiConverterUInt64.lift,
moqExceptionErrorHandler,
);
}

void removeSection({required String name}) {
return rustCall((status) {
uniffi_moq_ffi_fn_method_moqmediacatalogproducer_remove_section(
Expand Down Expand Up @@ -10777,12 +10793,13 @@ external void uniffi_moq_ffi_fn_method_moqflatesnapshotproducer_finish(
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Void Function(Pointer<Void>, RustBuffer, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
@Native<
Void Function(Pointer<Void>, RustBuffer, RustBuffer, Pointer<RustCallStatus>)
>(assetId: _uniffiAssetId)
external void uniffi_moq_ffi_fn_method_moqflatesnapshotproducer_update(
Pointer<Void> ptr,
RustBuffer payload,
RustBuffer timestamp_us,
Pointer<RustCallStatus> uniffiStatus,
);

Expand Down Expand Up @@ -10817,12 +10834,13 @@ external Pointer<Void> uniffi_moq_ffi_fn_constructor_moqflatestreamproducer_new(
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Void Function(Pointer<Void>, RustBuffer, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
@Native<
Void Function(Pointer<Void>, RustBuffer, RustBuffer, Pointer<RustCallStatus>)
>(assetId: _uniffiAssetId)
external void uniffi_moq_ffi_fn_method_moqflatestreamproducer_append(
Pointer<Void> ptr,
RustBuffer payload,
RustBuffer timestamp_us,
Pointer<RustCallStatus> uniffiStatus,
);

Expand Down Expand Up @@ -10921,12 +10939,13 @@ external void uniffi_moq_ffi_fn_method_moqjsonsnapshotproducer_finish(
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Void Function(Pointer<Void>, RustBuffer, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
@Native<
Void Function(Pointer<Void>, RustBuffer, RustBuffer, Pointer<RustCallStatus>)
>(assetId: _uniffiAssetId)
external void uniffi_moq_ffi_fn_method_moqjsonsnapshotproducer_update(
Pointer<Void> ptr,
RustBuffer value,
RustBuffer timestamp_us,
Pointer<RustCallStatus> uniffiStatus,
);

Expand Down Expand Up @@ -10999,12 +11018,13 @@ external Pointer<Void> uniffi_moq_ffi_fn_constructor_moqjsonstreamproducer_new(
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Void Function(Pointer<Void>, RustBuffer, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
@Native<
Void Function(Pointer<Void>, RustBuffer, RustBuffer, Pointer<RustCallStatus>)
>(assetId: _uniffiAssetId)
external void uniffi_moq_ffi_fn_method_moqjsonstreamproducer_append(
Pointer<Void> ptr,
RustBuffer value,
RustBuffer timestamp_us,
Pointer<RustCallStatus> uniffiStatus,
);

Expand Down Expand Up @@ -11084,6 +11104,14 @@ uniffi_moq_ffi_fn_constructor_moqmediacatalogproducer_new(
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Uint64 Function(Pointer<Void>, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
external int uniffi_moq_ffi_fn_method_moqmediacatalogproducer_now(
Pointer<Void> ptr,
Pointer<RustCallStatus> uniffiStatus,
);

@Native<Void Function(Pointer<Void>, RustBuffer, Pointer<RustCallStatus>)>(
assetId: _uniffiAssetId,
)
Expand Down Expand Up @@ -12850,6 +12878,9 @@ external int uniffi_moq_ffi_checksum_method_moqmediacatalogconsumer_cancel();
@Native<Uint16 Function()>(assetId: _uniffiAssetId)
external int uniffi_moq_ffi_checksum_method_moqmediacatalogconsumer_next();

@Native<Uint16 Function()>(assetId: _uniffiAssetId)
external int uniffi_moq_ffi_checksum_method_moqmediacatalogproducer_now();

@Native<Uint16 Function()>(assetId: _uniffiAssetId)
external int
uniffi_moq_ffi_checksum_method_moqmediacatalogproducer_remove_section();
Expand Down Expand Up @@ -13323,10 +13354,10 @@ void _checkApiChecksums() {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqflatesnapshotproducer_update() !=
28820) {
29136) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqflatestreamproducer_append() != 38961) {
if (uniffi_moq_ffi_checksum_method_moqflatestreamproducer_append() != 45773) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqflatestreamproducer_finish() != 6982) {
Expand All @@ -13348,7 +13379,7 @@ void _checkApiChecksums() {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqjsonsnapshotproducer_update() !=
18037) {
17590) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqjsonstreamconsumer_cancel() != 29308) {
Expand All @@ -13357,7 +13388,7 @@ void _checkApiChecksums() {
if (uniffi_moq_ffi_checksum_method_moqjsonstreamconsumer_next() != 7523) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqjsonstreamproducer_append() != 12571) {
if (uniffi_moq_ffi_checksum_method_moqjsonstreamproducer_append() != 36078) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqjsonstreamproducer_demand() != 52854) {
Expand All @@ -13373,6 +13404,9 @@ void _checkApiChecksums() {
if (uniffi_moq_ffi_checksum_method_moqmediacatalogconsumer_next() != 43296) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqmediacatalogproducer_now() != 14140) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqmediacatalogproducer_remove_section() !=
36089) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
Expand Down Expand Up @@ -13443,7 +13477,7 @@ void _checkApiChecksums() {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqmediatrackproducer_write_frame() !=
53915) {
7616) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqmediatrackstreamproducer_demand() !=
Expand Down Expand Up @@ -13550,7 +13584,7 @@ void _checkApiChecksums() {
if (uniffi_moq_ffi_checksum_method_moqgroupproducer_sequence() != 21067) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqgroupproducer_write_frame() != 51857) {
if (uniffi_moq_ffi_checksum_method_moqgroupproducer_write_frame() != 42053) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqgrouprequest_abort() != 26970) {
Expand Down Expand Up @@ -13579,7 +13613,7 @@ void _checkApiChecksums() {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqtrackproducer_append_datagram() !=
31895) {
8934) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqtrackproducer_append_group() != 45225) {
Expand All @@ -13603,7 +13637,7 @@ void _checkApiChecksums() {
if (uniffi_moq_ffi_checksum_method_moqtrackproducer_finish_at() != 24581) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqtrackproducer_write_frame() != 1418) {
if (uniffi_moq_ffi_checksum_method_moqtrackproducer_write_frame() != 32196) {
throw UniffiInternalError.panicked("UniFFI API checksum mismatch");
}
if (uniffi_moq_ffi_checksum_method_moqtrackrequest_abort() != 62713) {
Expand Down
Loading
Loading