Skip to content

Fixed extinf parsing with multiple comas #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
everappz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed extinf parsing with multiple comas #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 20 additions & 16 deletions Source/M3U8MediaPlaylist.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,25 +104,29 @@ - (void)parseMediaPlaylist
if ([line hasPrefix:M3U8_EXTINF]) {
line = [line stringByReplacingOccurrencesOfString:M3U8_EXTINF withString:@""];

NSArray<NSString *> *components = [line componentsSeparatedByString:@","];
NSString *info = components.firstObject;
if (info) {
NSString *blankMark = @" ";
NSArray<NSString *> *additions = [info componentsSeparatedByString:blankMark];
// get duration
NSString *duration = additions.firstObject;
params[M3U8_EXTINF_DURATION] = duration;
NSRange commaRange = [line rangeOfString:@"," options:NSBackwardsSearch];
if (commaRange.location != NSNotFound) {
NSString *info = [line substringToIndex:commaRange.location];
NSString *title = [line substringFromIndex:commaRange.location + 1];

// get additional parameters from Extended M3U https://en.wikipedia.org/wiki/M3U#Extended_M3U
if (additions.count > 1) {
// no need remove duration(first element). `m3u_attributesFromAssignmentByMark` function will skip first non-equation value.
params[M3U8_EXTINF_ADDITIONAL_PARAMETERS] = [additions m3u_attributesFromAssignmentByMark:blankMark];
if (info) {
NSString *blankMark = @" ";
NSArray<NSString *> *additions = [info componentsSeparatedByString:blankMark];
// get duration
NSString *duration = additions.firstObject;
params[M3U8_EXTINF_DURATION] = duration;

// get additional parameters from Extended M3U https://en.wikipedia.org/wiki/M3U#Extended_M3U
if (additions.count > 1) {
// no need remove duration(first element). `m3u_attributesFromAssignmentByMark` function will skip first non-equation value.
params[M3U8_EXTINF_ADDITIONAL_PARAMETERS] = [additions m3u_attributesFromAssignmentByMark:blankMark];
}
}

// Get the title after the last comma
params[M3U8_EXTINF_TITLE] = title;
}
if (components.count > 1) {
params[M3U8_EXTINF_TITLE] = components[1];
}


line = reader.next;
// read ByteRange. only for version 4
M3U8ExtXByteRange *byteRange = nil;
Expand Down
Loading