Skip to content
4 changes: 2 additions & 2 deletions rs/moq-net/src/ietf/subscriber.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::sync::Arc;

use crate::{
Broadcast, BroadcastDynamic, Error, Frame, FrameProducer, Group, GroupProducer, MAX_FRAME_SIZE, OriginProducer,
Path, PathOwned, StatsHandle, SubscriberStats, SubscriberTrack, Track, TrackProducer, TrackRequest,
Path, PathOwned, PendingTrack, StatsHandle, SubscriberStats, SubscriberTrack, Track, TrackProducer,
coding::{Reader, Stream},
ietf::{self, Control, FilterType, GroupOrder, RequestId},
model::BroadcastProducer,
Expand Down Expand Up @@ -536,7 +536,7 @@ impl<S: web_transport_trait::Session> Subscriber<S> {
Ok(())
}

async fn run_subscribe(&mut self, broadcast_path: Path<'_>, broadcast: BroadcastDynamic, request: TrackRequest) {
async fn run_subscribe(&mut self, broadcast_path: Path<'_>, broadcast: BroadcastDynamic, request: PendingTrack) {
// Accept right away: IETF group data can arrive before SubscribeOk, so we
// need the producer in place to route it. This also unblocks the
// downstream subscriber's `consume_track`.
Expand Down
8 changes: 4 additions & 4 deletions rs/moq-net/src/lite/subscriber.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ use futures::{StreamExt, stream::FuturesUnordered};

use crate::{
AsPath, BandwidthProducer, Broadcast, BroadcastDynamic, Compression, Error, Frame, FrameProducer, Group,
GroupProducer, MAX_FRAME_SIZE, OriginProducer, Path, PathOwned, StatsHandle, SubscriberStats, SubscriberTrack,
Timescale, Timestamp, Track, TrackProducer, TrackRequest,
GroupProducer, MAX_FRAME_SIZE, OriginProducer, Path, PathOwned, PendingTrack, StatsHandle, SubscriberStats,
SubscriberTrack, Timescale, Timestamp, Track, TrackProducer,
coding::{Reader, Stream},
lite,
model::BroadcastProducer,
Expand Down Expand Up @@ -485,7 +485,7 @@ impl<S: web_transport_trait::Session> Subscriber<S> {
/// to uncap. The stream stays open across the whole lifecycle — only a timeout
/// or a publisher-side close ends it. This avoids the stream-churn / duplicate-fetch
/// race that an unsubscribe-and-reissue approach would have.
async fn run_subscribe(&mut self, path: PathOwned, broadcast: BroadcastDynamic, request: TrackRequest) {
async fn run_subscribe(&mut self, path: PathOwned, broadcast: BroadcastDynamic, request: PendingTrack) {
// Subscriber-side track stats; counters bump as frames/bytes/groups arrive.
// Drop on subscription end records `subscriber.subscriptions_closed`. We use
// subscriber_track to avoid double-counting broadcasts: the broadcast lifetime
Expand Down Expand Up @@ -544,7 +544,7 @@ impl<S: web_transport_trait::Session> Subscriber<S> {
&self,
id: u64,
name: &str,
request: TrackRequest,
request: PendingTrack,
track_stats: Arc<SubscriberTrack>,
broadcast: &BroadcastDynamic,
msg: lite::Subscribe<'_>,
Expand Down
Loading
Loading