Skip to content

Request range to determine seekability #23

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
iamszabo wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Request range to determine seekability #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0e959f
Fix: Request a byte=0-1 range in order to receive a possible 206 stat…
iamszabo Dec 16, 2022
1e14f37
Bumps version number to 2.4.25
iamszabo Dec 16, 2022
7d246aa
Fix: Audio is not seekable if Accept-Ranges is none
iamszabo Dec 16, 2022
78cca9b
Fix: Only send bytes=0-1 range for the initial request
iamszabo Dec 16, 2022
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
2 changes: 1 addition & 1 deletion StreamingKit.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "StreamingKit"
s.version = "2.4.24"
s.version = "2.4.25"
s.summary = "A fast and extensible audio streamer for iOS and OSX with support for gapless playback and custom (non-HTTP) sources."
s.homepage = "https://github.com/tumtumtum/StreamingKit/"
s.license = 'MIT'
Expand Down
15 changes: 10 additions & 5 deletions StreamingKit/StreamingKit/STKHTTPDataSource.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,12 +307,13 @@ -(BOOL) parseHttpHeader

self->iceHeaderData = nil;
}

if (([httpHeaders objectForKey:@"Accept-Ranges"] ?: [httpHeaders objectForKey:@"accept-ranges"]) != nil)

NSString* range = ([httpHeaders objectForKey:@"Accept-Ranges"] ?: [httpHeaders objectForKey:@"accept-ranges"]);
if (range != nil && ![[range lowercaseString] isEqualToString: @"none"])
{
self->supportsSeek = YES;
}

if (self.httpStatusCode == 200)
{
if (seekStart == 0)
Expand All @@ -339,6 +340,8 @@ -(BOOL) parseHttpHeader
{
fileLength = [[components objectAtIndex:1] integerValue];
}

self->supportsSeek = YES;
}
else if (self.httpStatusCode == 416)
{
Expand Down Expand Up @@ -503,7 +506,7 @@ -(void) open

-(void) openForSeek:(BOOL)forSeek
{

@synchronized (self) {
int localRequestSerialNumber;

Expand All @@ -529,8 +532,10 @@ -(void) openForSeek:(BOOL)forSeek
if (seekStart > 0 && supportsSeek)
{
CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Range"), (__bridge CFStringRef)[NSString stringWithFormat:@"bytes=%lld-", seekStart]);

discontinuous = YES;
} else if (seekStart == 0) {
CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Range"), (__bridge CFStringRef)[NSString stringWithFormat:@"bytes=0-1"]);
}

for (NSString* key in self->requestHeaders)
Expand Down