Skip to content

Support seek operation while the playback is paused. #27

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
ened wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support seek operation while the playback is paused. #27

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions DLGPlayer/DLGPlayer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ typedef void (^onPauseComplete)(void);
@property (nonatomic) double duration;
@property (nonatomic) BOOL opened;
@property (nonatomic) BOOL playing;
@property (nonatomic) BOOL seeking;
@property (nonatomic) BOOL buffering;
@property (nonatomic, strong) NSDictionary *metadata;

Expand Down
56 changes: 41 additions & 15 deletions DLGPlayer/DLGPlayer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,11 @@ - (void)startFrameReaderThread {

- (void)runFrameReader {
@autoreleasepool {
while (self.playing) {
while (self.playing || self.seeking) {
[self readFrame];
if (self.requestSeek) {
[self seekPositionInFrameReader];
self.seeking = YES;
} else {
[NSThread sleepForTimeInterval:1.5];
}
Expand All @@ -259,7 +260,7 @@ - (void)readFrame {
double tempDuration = 0;
dispatch_time_t t = dispatch_time(DISPATCH_TIME_NOW, 0.02 * NSEC_PER_SEC);

while (self.playing && !self.decoder.isEOF && !self.requestSeek
while ((self.playing || self.seeking) && !self.decoder.isEOF && !self.requestSeek
&& (self.bufferedDuration + tempDuration) < self.maxBufferDuration) {
@autoreleasepool {
NSArray *fs = [self.decoder readFrames];
Expand All @@ -271,6 +272,10 @@ - (void)readFrame {
if (f.type == kDLGPlayerFrameTypeVideo) {
[tempVFrames addObject:f];
tempDuration += f.duration;

if (self.seeking) {
break;
}
}
}

Expand All @@ -286,10 +291,12 @@ - (void)readFrame {
}
}
{
for (DLGPlayerFrame *f in fs) {
if (f.type == kDLGPlayerFrameTypeAudio) {
[tempAFrames addObject:f];
if (!self.decoder.hasVideo) tempDuration += f.duration;
if (!self.seeking) {
for (DLGPlayerFrame *f in fs) {
if (f.type == kDLGPlayerFrameTypeAudio) {
[tempAFrames addObject:f];
if (!self.decoder.hasVideo) tempDuration += f.duration;
}
}
}

Expand Down Expand Up @@ -361,7 +368,7 @@ - (void)seekPositionInFrameReader {
}

- (void)render {
if (!self.playing) return;
if (!(self.playing || self.seeking)) return;

BOOL eof = self.decoder.isEOF;
BOOL noframes = ((self.decoder.hasVideo && self.vframes.count <= 0) ||
Expand All @@ -374,14 +381,16 @@ - (void)render {
return;
}

if (noframes && !self.notifiedBufferStart) {
self.notifiedBufferStart = YES;
NSDictionary *userInfo = @{ DLGPlayerNotificationBufferStateKey : @(self.notifiedBufferStart) };
[[NSNotificationCenter defaultCenter] postNotificationName:DLGPlayerNotificationBufferStateChanged object:self userInfo:userInfo];
} else if (!noframes && self.notifiedBufferStart && self.bufferedDuration >= self.minBufferDuration) {
self.notifiedBufferStart = NO;
NSDictionary *userInfo = @{ DLGPlayerNotificationBufferStateKey : @(self.notifiedBufferStart) };
[[NSNotificationCenter defaultCenter] postNotificationName:DLGPlayerNotificationBufferStateChanged object:self userInfo:userInfo];
if (!self.seeking) {
if (noframes && !self.notifiedBufferStart) {
self.notifiedBufferStart = YES;
NSDictionary *userInfo = @{ DLGPlayerNotificationBufferStateKey : @(self.notifiedBufferStart) };
[[NSNotificationCenter defaultCenter] postNotificationName:DLGPlayerNotificationBufferStateChanged object:self userInfo:userInfo];
} else if (!noframes && self.notifiedBufferStart && self.bufferedDuration >= self.minBufferDuration) {
self.notifiedBufferStart = NO;
NSDictionary *userInfo = @{ DLGPlayerNotificationBufferStateKey : @(self.notifiedBufferStart) };
[[NSNotificationCenter defaultCenter] postNotificationName:DLGPlayerNotificationBufferStateChanged object:self userInfo:userInfo];
}
}

// Render if has picture
Expand Down Expand Up @@ -414,6 +423,7 @@ - (void)render {
}
}
[self.view render:frame];
self.seeking = NO;

// Sync audio with video
double syncTime = [self syncTime];
Expand Down Expand Up @@ -524,6 +534,22 @@ - (UIView *)playerView {
- (void)setPosition:(double)position {
self.requestSeekPosition = position;
self.requestSeek = YES;

[self.vframes removeAllObjects];
[self.aframes removeAllObjects];

self.seeking = YES;

__weak typeof(self)weakSelf = self;
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
__strong typeof(weakSelf)strongSelf = weakSelf;
if (!strongSelf) {
return;
}

[strongSelf render];
[strongSelf startFrameReaderThread];
});
}

- (double)position {
Expand Down