Skip to content
Draft
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
7 changes: 7 additions & 0 deletions smelter-core/src/pipeline/decoder/dynamic_stream.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{iter, sync::Arc};

use crossbeam_channel::Sender;
use smelter_render::{Frame, error::ErrorStack};
use tracing::error;

Expand All @@ -20,6 +21,7 @@ where
source: Source,
eos_sent: bool,
decoders_info: VideoDecoderMapping,
keyframe_request_sender: Sender<()>,
}

impl<Source> DynamicVideoDecoderStream<Source>
Expand All @@ -30,6 +32,7 @@ where
ctx: Arc<PipelineCtx>,
decoders_info: VideoDecoderMapping,
source: Source,
keyframe_request_sender: Sender<()>,
) -> Self {
Self {
ctx,
Expand All @@ -38,6 +41,7 @@ where
source,
eos_sent: false,
decoders_info,
keyframe_request_sender,
}
}

Expand Down Expand Up @@ -99,6 +103,9 @@ where
self.ensure_decoder(samples.kind);
let decoder = self.decoder.as_mut()?;
let chunks = decoder.decode(samples);
if chunks.len() == 0 {
let _ = self.keyframe_request_sender.try_send(());
}
Some(chunks.into_iter().map(PipelineEvent::Data).collect())
}
Some(PipelineEvent::EOS) | None => match self.eos_sent {
Expand Down
13 changes: 10 additions & 3 deletions smelter-core/src/pipeline/webrtc/video_input_processing_loop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,15 @@ impl InitializableThread for VideoTrackThread {
VideoDecoderMapping,
VideoPayloadTypeMapping,
Sender<PipelineEvent<Frame>>,
Sender<()>,
);

type SpawnOutput = VideoTrackThreadHandle;
type SpawnError = DecoderInitError;

fn init(options: Self::InitOptions) -> Result<(Self, Self::SpawnOutput), Self::SpawnError> {
let (ctx, decoder_mapping, payload_type_mapping, frame_sender) = options;
let (ctx, decoder_mapping, payload_type_mapping, frame_sender, keyframe_request_sender) =
options;
let (rtp_packet_sender, rtp_packet_receiver) = tokio::sync::mpsc::channel(5000);

let packet_stream = AsyncReceiverIter {
Expand All @@ -87,8 +89,13 @@ impl InitializableThread for VideoTrackThread {
let depayloader_stream =
DynamicDepayloaderStream::new(payload_type_mapping, packet_stream).flatten();

let decoder_stream =
DynamicVideoDecoderStream::new(ctx, decoder_mapping, depayloader_stream).flatten();
let decoder_stream = DynamicVideoDecoderStream::new(
ctx,
decoder_mapping,
depayloader_stream,
keyframe_request_sender,
)
.flatten();

let result_stream = decoder_stream
.filter_map(|event| match event {
Expand Down
26 changes: 25 additions & 1 deletion smelter-core/src/pipeline/webrtc/whip_input/process_tracks.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
use std::sync::Arc;

use crossbeam_channel::bounded;
use tracing::warn;
use webrtc::{rtp_transceiver::RTCRtpTransceiver, track::track_remote::TrackRemote};
use webrtc::{
rtcp::payload_feedbacks::picture_loss_indication::PictureLossIndication,
rtp_transceiver::RTCRtpTransceiver, track::track_remote::TrackRemote,
};

use crate::{
codecs::VideoDecoderOptions,
Expand Down Expand Up @@ -79,13 +83,33 @@ pub async fn process_video_track(
let WhipWhepServerState { inputs, ctx, .. } = state;
let frame_sender = inputs.get_with(&endpoint_id, |input| Ok(input.frame_sender.clone()))?;

let (keyframe_request_sender, keyframe_request_receiver) = bounded(1);
let ssrc = track.ssrc();
let rtc_receiver_clone = rtc_receiver.clone();
tokio::spawn(async move {
let transport = rtc_receiver_clone.transport();
for _ in keyframe_request_receiver.into_iter() {
warn!("Sending PLI");
let pli = PictureLossIndication {
// For receive-only endpoints RTP sender SSRC can be set to 0.
sender_ssrc: 0,
media_ssrc: ssrc,
};

if let Err(err) = transport.write_rtcp(&[Box::new(pli)]).await {
warn!(?err)
}
}
});

let handle = VideoTrackThread::spawn(
format!("WHIP input video, endpoint_id: {}", endpoint_id),
(
ctx.clone(),
decoder_mapping,
payload_type_mapping,
frame_sender,
keyframe_request_sender,
),
)?;

Expand Down
Loading