chris/iced_video_player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix network seeking

Browse source
This commit is contained in:
jazzfool 2024-10-31 21:18:17 +11:00
parent f029b073d4
commit 818df27288
2 changed files with 63 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/video.rs
View file

@ -15,7 +15,7 @@ pub enum Position {
/// Position based on time.
///
/// Not the most accurate format for videos.
Time(std::time::Duration),
Time(Duration),
/// Position based on nth frame.
Frame(u64),
}
@ -29,8 +29,8 @@ impl From<Position> for gst::GenericFormattedValue {
}
}
impl From<std::time::Duration> for Position {
fn from(t: std::time::Duration) -> Self {
impl From<Duration> for Position {
fn from(t: Duration) -> Self {
Position::Time(t)
}
}
@ -52,14 +52,13 @@ pub(crate) struct Internal {
pub(crate) width: i32,
pub(crate) height: i32,
pub(crate) framerate: f64,
pub(crate) duration: std::time::Duration,
pub(crate) duration: Duration,
pub(crate) speed: f64,
pub(crate) sync_av: bool,
pub(crate) frame: Arc<Mutex<Vec<u8>>>,
pub(crate) upload_frame: Arc<AtomicBool>,
pub(crate) last_frame_time: Arc<Mutex<Instant>>,
pub(crate) paused: Arc<AtomicBool>,
pub(crate) looping: bool,
pub(crate) is_eos: bool,
pub(crate) restart_stream: bool,
@ -73,16 +72,12 @@ pub(crate) struct Internal {
impl Internal {
pub(crate) fn seek(&self, position: impl Into<Position>, accurate: bool) -> Result<(), Error> {
let position = position.into();
// gstreamer complains if the start & end value types aren't the same
let end = match &position {
Position::Time(_) => Position::Time(std::time::Duration::ZERO),
Position::Frame(_) => Position::Frame(0),
};
self.source.seek(
// gstreamer complains if the start & end value types aren't the same
match &position {
Position::Time(_) => self.source.seek(
self.speed,
gst::SeekFlags::FLUSH
| gst::SeekFlags::KEY_UNIT
| if accurate {
gst::SeekFlags::ACCURATE
} else {
@ -90,9 +85,24 @@ impl Internal {
},
gst::SeekType::Set,
gst::GenericFormattedValue::from(position),
gst::SeekType::End,
gst::GenericFormattedValue::from(end),
)?;
gst::SeekType::Set,
gst::ClockTime::NONE,
)?,
Position::Frame(_) => self.source.seek(
self.speed,
gst::SeekFlags::FLUSH
| if accurate {
gst::SeekFlags::ACCURATE
} else {
gst::SeekFlags::empty()
},
gst::SeekType::Set,
gst::GenericFormattedValue::from(position),
gst::SeekType::Set,
gst::format::Default::NONE,
)?,
};
Ok(())
}
@ -138,7 +148,6 @@ impl Internal {
gst::State::Playing
})
.unwrap(/* state was changed in ctor; state errors caught there */);
self.paused.store(paused, Ordering::SeqCst);
// Set restart_stream flag to make the stream restart on the next Message::NextFrame
if self.is_eos && !paused {
@ -146,6 +155,10 @@ impl Internal {
}
}
pub(crate) fn paused(&self) -> bool {
self.source.state(gst::ClockTime::ZERO).1 == gst::State::Paused
}
/// Syncs audio with video when there is (inevitably) latency presenting the frame.
pub(crate) fn set_av_offset(&mut self, offset: Duration) {
if self.sync_av {
@ -185,7 +198,7 @@ impl Video {
pub fn new(uri: &url::Url) -> Result<Self, Error> {
gst::init()?;
let pipeline = format!("playbin uri=\"{}\" text-sink=\"appsink name=iced_text caps=text/x-raw\" video-sink=\"videoscale ! videoconvert ! appsink name=iced_video drop=true caps=video/x-raw,format=NV12,pixel-aspect-ratio=1/1\"", uri.as_str());
let pipeline = format!("playbin uri=\"{}\" text-sink=\"appsink name=iced_text sync=true caps=text/x-raw\" video-sink=\"videoscale ! videoconvert ! appsink name=iced_video drop=true caps=video/x-raw,format=NV12,pixel-aspect-ratio=1/1\"", uri.as_str());
let pipeline = gst::parse::launch(pipeline.as_ref())?
.downcast::<gst::Pipeline>()
.map_err(|_| Error::Cast)?;
@ -253,7 +266,7 @@ impl Video {
return Err(Error::Framerate(framerate));
}
let duration = std::time::Duration::from_nanos(
let duration = Duration::from_nanos(
pipeline
.query_duration::<gst::ClockTime>()
.map(|duration| duration.nseconds())
@ -271,25 +284,26 @@ impl Video {
let upload_frame = Arc::new(AtomicBool::new(false));
let alive = Arc::new(AtomicBool::new(true));
let last_frame_time = Arc::new(Mutex::new(Instant::now()));
let paused = Arc::new(AtomicBool::new(false));
let frame_ref = Arc::clone(&frame);
let upload_frame_ref = Arc::clone(&upload_frame);
let alive_ref = Arc::clone(&alive);
let last_frame_time_ref = Arc::clone(&last_frame_time);
let paused_ref = Arc::clone(&paused);
let subtitle_text = Arc::new(Mutex::new(None));
let upload_text = Arc::new(AtomicBool::new(false));
let subtitle_text_ref = Arc::clone(&subtitle_text);
let upload_text_ref = Arc::clone(&upload_text);
let pipeline_ref = pipeline.clone();
let worker = std::thread::spawn(move || {
let mut clear_subtitles_at = None;
while alive_ref.load(Ordering::Acquire) {
if let Err(gst::FlowError::Error) = (|| -> Result<(), gst::FlowError> {
let sample = if paused_ref.load(Ordering::SeqCst) {
let sample =
if pipeline_ref.state(gst::ClockTime::ZERO).1 != gst::State::Playing {
video_sink
.try_pull_preroll(gst::ClockTime::from_mseconds(16))
.ok_or(gst::FlowError::Eos)?
@ -370,7 +384,6 @@ impl Video {
frame,
upload_frame,
last_frame_time,
paused,
looping: false,
is_eos: false,
restart_stream: false,
@ -439,7 +452,7 @@ impl Video {
/// Get if the media is paused or not.
pub fn paused(&self) -> bool {
self.0.borrow().paused.load(Ordering::SeqCst)
self.0.borrow().paused()
}
/// Jumps to a specific position in the media.
@ -461,8 +474,8 @@ impl Video {
}
/// Get the current playback position in time.
pub fn position(&self) -> std::time::Duration {
std::time::Duration::from_nanos(
pub fn position(&self) -> Duration {
Duration::from_nanos(
self.0
.borrow()
.source
@ -472,7 +485,7 @@ impl Video {
}
/// Get the media duration.
pub fn duration(&self) -> std::time::Duration {
pub fn duration(&self) -> Duration {
self.0.borrow().duration
}

16
src/video_player.rs
View file

@ -6,7 +6,7 @@ use iced::{
};
use iced_wgpu::primitive::Renderer as PrimitiveRenderer;
use log::error;
use std::{marker::PhantomData, sync::atomic::Ordering};
use std::{marker::PhantomData, sync::atomic::Ordering, time::Duration};
use std::{sync::Arc, time::Instant};
/// Video player widget which displays the current frame of a [`Video`](crate::Video).
@ -218,7 +218,7 @@ where
let mut inner = self.video.0.borrow_mut();
if let iced::Event::Window(iced::window::Event::RedrawRequested(_)) = event {
if inner.restart_stream || (!inner.is_eos && !inner.paused.load(Ordering::SeqCst)) {
if inner.restart_stream || (!inner.is_eos && !inner.paused()) {
let mut restart_stream = false;
if inner.restart_stream {
restart_stream = true;
@ -255,7 +255,7 @@ where
// Don't run eos_pause if restart_stream is true; fixes "pausing" after restarting a stream
if restart_stream {
if let Err(err) = inner.restart_stream() {
error!("cannot restart stream (can't seek): {err:#?}")
error!("cannot restart stream (can't seek): {err:#?}");
}
} else if eos_pause {
inner.is_eos = true;
@ -263,13 +263,9 @@ where
}
if inner.upload_frame.load(Ordering::SeqCst) {
shell.request_redraw(iced::window::RedrawRequest::NextFrame);
if let Some(on_new_frame) = self.on_new_frame.clone() {
shell.publish(on_new_frame);
}
} else {
shell
.request_redraw(iced::window::RedrawRequest::At(std::time::Instant::now()));
}
if let Some(on_subtitle_text) = &self.on_subtitle_text {
@ -279,6 +275,12 @@ where
}
}
}
shell.request_redraw(iced::window::RedrawRequest::NextFrame);
} else {
shell.request_redraw(iced::window::RedrawRequest::At(
Instant::now() + Duration::from_millis(32),
));
}
Status::Captured
} else {