mirrors/m3u8-rs
1
1
Fork 0
mirror of https://github.com/rutgersc/m3u8-rs.git synced 2025-01-02 19:28:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42 from sdroege/u64-instead-of-i32

Browse source 
Use `u64` instead of `i32` for byte ranges and sequence numbers
This commit is contained in:
rutgersc 2022-02-19 13:38:06 +01:00 committed by GitHub
commit 39b52a1d4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -94,9 +94,9 @@ pub struct MasterPlaylist {
pub struct MediaPlaylist { pub struct MediaPlaylist {
pub version: usize, pub version: usize,
pub target_duration: f32, pub target_duration: f32,
pub media_sequence: i32, pub media_sequence: u64,
pub segments: Vec<MediaSegment>, pub segments: Vec<MediaSegment>,
pub discontinuity_sequence: i32, pub discontinuity_sequence: u64,
pub end_list: bool, pub end_list: bool,
pub playlist_type: MediaPlaylistType, pub playlist_type: MediaPlaylistType,
pub i_frames_only: bool, pub i_frames_only: bool,

8
src/parser.rs
View file

@ -343,8 +343,8 @@ enum MediaPlaylistTag {
Version(usize), Version(usize),
Segment(SegmentTag), Segment(SegmentTag),
TargetDuration(f32), TargetDuration(f32),
MediaSequence(i32), MediaSequence(u64),
DiscontinuitySequence(i32), DiscontinuitySequence(u64),
EndList, EndList,
PlaylistType(MediaPlaylistType), PlaylistType(MediaPlaylistType),
IFramesOnly, IFramesOnly,
@ -644,11 +644,11 @@ fn consume_line(i: &[u8]) -> IResult<&[u8], String> {
)(i) )(i)
} }
fn number(i: &[u8]) -> IResult<&[u8], i32> { fn number(i: &[u8]) -> IResult<&[u8], u64> {
map_res(take_while1(is_digit), |s| { map_res(take_while1(is_digit), |s| {
// Can't fail because we validated it above already // Can't fail because we validated it above already
let s = str::from_utf8(s).unwrap(); let s = str::from_utf8(s).unwrap();
str::parse::<i32>(s) str::parse::<u64>(s)
})(i) })(i)
} }

8
src/playlist.rs
View file

@ -401,10 +401,10 @@ pub struct MediaPlaylist {
/// `#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>`
pub media_sequence: i32, pub media_sequence: u64,
pub segments: Vec<MediaSegment>, pub segments: Vec<MediaSegment>,
/// `#EXT-X-DISCONTINUITY-SEQUENCE:<number>` /// `#EXT-X-DISCONTINUITY-SEQUENCE:<number>`
pub discontinuity_sequence: i32, pub discontinuity_sequence: u64,
/// `#EXT-X-ENDLIST` /// `#EXT-X-ENDLIST`
pub end_list: bool, pub end_list: bool,
/// `#EXT-X-PLAYLIST-TYPE` /// `#EXT-X-PLAYLIST-TYPE`
@ -637,8 +637,8 @@ impl Map {
/// URI line that follows it in the Playlist. /// URI line that follows it in the Playlist.
#[derive(Debug, Default, PartialEq, Eq, Clone)] #[derive(Debug, Default, PartialEq, Eq, Clone)]
pub struct ByteRange { pub struct ByteRange {
pub length: i32, pub length: u64,
pub offset: Option<i32>, pub offset: Option<u64>,
} }
impl ByteRange { impl ByteRange {