Sulkta-OSS/rustypipe
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: stream ordering, downloader progress bar

Browse source
This commit is contained in:
ThetaDev 2022-11-04 19:45:58 +01:00
parent 6e2ba71f33
commit a706eb172e
6 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/param/stream_filter.rs
View file

@ -1,9 +1,10 @@
//! Filters for selecting audio/video streams
use std::collections::HashSet;
use std::{cmp::Ordering, collections::HashSet};
use crate::model::{
AudioCodec, AudioFormat, AudioStream, VideoCodec, VideoFormat, VideoPlayer, VideoStream,
AudioCodec, AudioFormat, AudioStream, QualityOrd, VideoCodec, VideoFormat, VideoPlayer,
VideoStream,
};
#[derive(Debug, Default, Clone)]
@ -302,14 +303,15 @@ impl VideoPlayer {
(Some(video_only_stream), self.select_audio_stream(filter))
}
(Some(video_stream), None) => (Some(video_stream), None),
(Some(video_stream), Some(video_only_stream)) => match video_only_stream > video_stream
{
true => match self.select_audio_stream(filter) {
Some(audio_stream) => (Some(video_only_stream), Some(audio_stream)),
None => (Some(video_stream), None),
},
false => (Some(video_stream), None),
},
(Some(video_stream), Some(video_only_stream)) => {
match video_only_stream.quality_cmp(video_stream) {
Ordering::Greater => match self.select_audio_stream(filter) {
Some(audio_stream) => (Some(video_only_stream), Some(audio_stream)),
None => (Some(video_stream), None),
},
_ => (Some(video_stream), None),
}
}
}
}
}