Merge branch 'duration_and_progress' of git://github.com/danielgindi/StreamingKit into danielgindi-duration_and_progress

This commit is contained in:
Thong Nguyen 2014-12-29 16:50:36 +00:00
commit 5784504e38
3 changed files with 5 additions and 0 deletions

1
StreamingKit/StreamingKit/STKDataSource.h Normal file → Executable file
View File

@ -49,6 +49,7 @@
@property (readonly) SInt64 position;
@property (readonly) SInt64 length;
@property (readonly) BOOL hasBytesAvailable;
@property (nonatomic, readwrite, assign) double durationHint;
@property (readwrite, unsafe_unretained) id<STKDataSourceDelegate> delegate;
-(BOOL) registerForEvents:(NSRunLoop*)runLoop;

1
StreamingKit/StreamingKit/STKQueueEntry.h Normal file → Executable file
View File

@ -28,6 +28,7 @@
volatile int processedPacketsCount;
volatile int processedPacketsSizeTotal;
AudioStreamBasicDescription audioStreamBasicDescription;
double durationHint;
}
@property (readonly) UInt64 audioDataLengthInBytes;

3
StreamingKit/StreamingKit/STKQueueEntry.m Normal file → Executable file
View File

@ -23,6 +23,7 @@
self.dataSource = dataSourceIn;
self.queueItemId = queueItemIdIn;
self->lastFrameQueued = -1;
self->durationHint = dataSourceIn.durationHint;
}
return self;
@ -60,6 +61,8 @@
-(double) duration
{
if (durationHint > 0.0) return durationHint;
if (self->sampleRate <= 0)
{
return 0;