mirrors/m3u8-rs
1
1
Fork 0
mirror of https://github.com/rutgersc/m3u8-rs.git synced 2024-06-10 00:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50 from vagetman/patch-3

Browse source 
`EXT-X-VERSION` tag may be absent
This commit is contained in:
Sebastian Dröge 2022-04-17 23:45:33 +03:00 committed by GitHub
parent 7173c26015 d941541be8
commit 85141f6a51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib.rs
View file

@ -41,7 +41,7 @@
//! use m3u8_rs::{MediaPlaylist, MediaPlaylistType, MediaSegment}; //! use m3u8_rs::{MediaPlaylist, MediaPlaylistType, MediaSegment};
//! //!
//! let playlist = MediaPlaylist { //! let playlist = MediaPlaylist {
//! version: 6, //! version: Some(6),
//! target_duration: 3.0, //! target_duration: 3.0,
//! media_sequence: 338559, //! media_sequence: 338559,
//! discontinuity_sequence: 1234, //! discontinuity_sequence: 1234,

4
src/parser.rs
View file

@ -249,7 +249,7 @@ fn master_playlist_from_tags(mut tags: Vec<MasterPlaylistTag>) -> MasterPlaylist
while let Some(tag) = tags.pop() { while let Some(tag) = tags.pop() {
match tag { match tag {
MasterPlaylistTag::Version(v) => { MasterPlaylistTag::Version(v) => {
master_playlist.version = v; master_playlist.version = Some(v);
} }
MasterPlaylistTag::AlternativeMedia(v) => { MasterPlaylistTag::AlternativeMedia(v) => {
master_playlist.alternatives.push(v); master_playlist.alternatives.push(v);
@ -396,7 +396,7 @@ fn media_playlist_from_tags(mut tags: Vec<MediaPlaylistTag>) -> MediaPlaylist {
while let Some(tag) = tags.pop() { while let Some(tag) = tags.pop() {
match tag { match tag {
MediaPlaylistTag::Version(v) => { MediaPlaylistTag::Version(v) => {
media_playlist.version = v; media_playlist.version = Some(v);
} }
MediaPlaylistTag::TargetDuration(d) => { MediaPlaylistTag::TargetDuration(d) => {
media_playlist.target_duration = d; media_playlist.target_duration = d;

16
src/playlist.rs
View file

@ -71,7 +71,7 @@ impl Playlist {
/// describes a different version of the same content. /// describes a different version of the same content.
#[derive(Debug, Default, PartialEq, Eq, Clone)] #[derive(Debug, Default, PartialEq, Eq, Clone)]
pub struct MasterPlaylist { pub struct MasterPlaylist {
pub version: usize, pub version: Option<usize>,
pub variants: Vec<VariantStream>, pub variants: Vec<VariantStream>,
pub session_data: Vec<SessionData>, pub session_data: Vec<SessionData>,
pub session_key: Vec<SessionKey>, pub session_key: Vec<SessionKey>,
@ -87,7 +87,11 @@ impl MasterPlaylist {
} }
pub fn write_to<T: Write>(&self, w: &mut T) -> std::io::Result<()> { pub fn write_to<T: Write>(&self, w: &mut T) -> std::io::Result<()> {
writeln!(w, "#EXTM3U\n#EXT-X-VERSION:{}", self.version)?; writeln!(w, "#EXTM3U\n")?;
if let Some(ref v) = self.version {
writeln!(w, "#EXT-X-VERSION:{}", v)?;
}
for alternative in &self.alternatives { for alternative in &self.alternatives {
alternative.write_to(w)?; alternative.write_to(w)?;
@ -403,7 +407,7 @@ impl SessionData {
/// sequentially will play the multimedia presentation. /// sequentially will play the multimedia presentation.
#[derive(Debug, Default, PartialEq, Clone)] #[derive(Debug, Default, PartialEq, Clone)]
pub struct MediaPlaylist { pub struct MediaPlaylist {
pub version: usize, pub version: Option<usize>,
/// `#EXT-X-TARGETDURATION:<s>` /// `#EXT-X-TARGETDURATION:<s>`
pub target_duration: f32, pub target_duration: f32,
/// `#EXT-X-MEDIA-SEQUENCE:<number>` /// `#EXT-X-MEDIA-SEQUENCE:<number>`
@ -425,7 +429,11 @@ pub struct MediaPlaylist {
impl MediaPlaylist { impl MediaPlaylist {
pub fn write_to<T: Write>(&self, w: &mut T) -> std::io::Result<()> { pub fn write_to<T: Write>(&self, w: &mut T) -> std::io::Result<()> {
writeln!(w, "#EXTM3U\n#EXT-X-VERSION:{}", self.version)?; writeln!(w, "#EXTM3U\n")?;
if let Some(ref v) = self.version {
writeln!(w, "#EXT-X-VERSION:{}", v)?;
}
writeln!(w, "#EXT-X-TARGETDURATION:{}", self.target_duration)?; writeln!(w, "#EXT-X-TARGETDURATION:{}", self.target_duration)?;
if self.media_sequence != 0 { if self.media_sequence != 0 {

5
tests/lib.rs
View file

@ -199,7 +199,7 @@ fn create_and_parse_master_playlist_empty() {
#[test] #[test]
fn create_and_parse_master_playlist_full() { fn create_and_parse_master_playlist_full() {
let mut playlist_original = Playlist::MasterPlaylist(MasterPlaylist { let mut playlist_original = Playlist::MasterPlaylist(MasterPlaylist {
version: 6, version: Some(6),
alternatives: vec![AlternativeMedia { alternatives: vec![AlternativeMedia {
media_type: AlternativeMediaType::Audio, media_type: AlternativeMediaType::Audio,
uri: Some("alt-media-uri".into()), uri: Some("alt-media-uri".into()),
@ -263,6 +263,7 @@ fn create_and_parse_media_playlist_empty() {
#[test] #[test]
fn create_and_parse_media_playlist_single_segment() { fn create_and_parse_media_playlist_single_segment() {
let mut playlist_original = Playlist::MediaPlaylist(MediaPlaylist { let mut playlist_original = Playlist::MediaPlaylist(MediaPlaylist {
target_duration: 2.0,
segments: vec![MediaSegment { segments: vec![MediaSegment {
uri: "20140311T113819-01-338559live.ts".into(), uri: "20140311T113819-01-338559live.ts".into(),
duration: 2.002, duration: 2.002,
@ -278,7 +279,7 @@ fn create_and_parse_media_playlist_single_segment() {
#[test] #[test]
fn create_and_parse_media_playlist_full() { fn create_and_parse_media_playlist_full() {
let mut playlist_original = Playlist::MediaPlaylist(MediaPlaylist { let mut playlist_original = Playlist::MediaPlaylist(MediaPlaylist {
version: 4, version: Some(4),
target_duration: 3.0, target_duration: 3.0,
media_sequence: 338559, media_sequence: 338559,
discontinuity_sequence: 1234, discontinuity_sequence: 1234,