Skip to content
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

Fix adding packet offset twice. #8

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

Fix adding packet offset twice. #8

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
2 changes: 1 addition & 1 deletion TDAudioStreamer/AudioStreamer/Classes/TDAudioFileStream.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

@required
- (void)audioFileStreamDidBecomeReady:(TDAudioFileStream *)audioFileStream;
- (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription;
- (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription;
- (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(const void *)data length:(UInt32)length;

@end
Expand Down
5 changes: 1 addition & 4 deletions TDAudioStreamer/AudioStreamer/Classes/TDAudioFileStream.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,7 @@ - (void)didReceivePackets:(const void *)packets packetDescriptions:(AudioStreamP
{
if (packetDescriptions) {
for (NSUInteger i = 0; i < numberOfPackets; i++) {
SInt64 packetOffset = packetDescriptions[i].mStartOffset;
UInt32 packetSize = packetDescriptions[i].mDataByteSize;

[self.delegate audioFileStream:self didReceiveData:(const void *)(packets + packetOffset) length:packetSize packetDescription:(AudioStreamPacketDescription)packetDescriptions[i]];
[self.delegate audioFileStream:self didReceiveData:(const void *)(packets) packetDescription:(AudioStreamPacketDescription)packetDescriptions[i]];
}
} else {
[self.delegate audioFileStream:self didReceiveData:(const void *)packets length:numberOfBytes];
Expand Down
2 changes: 1 addition & 1 deletion TDAudioStreamer/AudioStreamer/Classes/TDAudioQueueBuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- (instancetype)initWithAudioQueue:(AudioQueueRef)audioQueue size:(UInt32)size;

- (NSInteger)fillWithData:(const void *)data length:(UInt32)length offset:(UInt32)offset;
- (BOOL)fillWithData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription;
- (BOOL)fillWithData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription;

- (void)enqueueWithAudioQueue:(AudioQueueRef)auidoQueue;
- (void)reset;
Expand Down
2 changes: 1 addition & 1 deletion TDAudioStreamer/AudioStreamer/Classes/TDAudioQueueBuffer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ - (NSInteger)fillWithData:(const void *)data length:(UInt32)length offset:(UInt3
return 0;
}

- (BOOL)fillWithData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription
- (BOOL)fillWithData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription
{
if (self.fillPosition + packetDescription.mDataByteSize > self.size || self.numberOfPacketDescriptions == kTDMaxPacketDescriptions) return NO;

Expand Down
2 changes: 1 addition & 1 deletion TDAudioStreamer/AudioStreamer/Classes/TDAudioQueueFiller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
@interface TDAudioQueueFiller : NSObject

+ (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data length:(UInt32)length offset:(UInt32)offset;
+ (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription;
+ (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription;

@end
6 changes: 3 additions & 3 deletions TDAudioStreamer/AudioStreamer/Classes/TDAudioQueueFiller.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ + (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data le
[self fillAudioQueue:audioQueue withData:data length:length offset:(length - (UInt32)leftovers)];
}

+ (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription
+ (void)fillAudioQueue:(TDAudioQueue *)audioQueue withData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription
{
TDAudioQueueBuffer *audioQueueBuffer = [audioQueue nextFreeBuffer];

BOOL hasMoreRoomForPackets = [audioQueueBuffer fillWithData:data length:length packetDescription:packetDescription];
BOOL hasMoreRoomForPackets = [audioQueueBuffer fillWithData:data packetDescription:packetDescription];

if (!hasMoreRoomForPackets) {
[audioQueue enqueue];
[self fillAudioQueue:audioQueue withData:data length:length packetDescription:packetDescription];
[self fillAudioQueue:audioQueue withData:data packetDescription:packetDescription];
}
}

Expand Down
4 changes: 2 additions & 2 deletions TDAudioStreamer/AudioStreamer/TDAudioInputStreamer.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,9 @@ - (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(con
[TDAudioQueueFiller fillAudioQueue:self.audioQueue withData:data length:length offset:0];
}

- (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(const void *)data length:(UInt32)length packetDescription:(AudioStreamPacketDescription)packetDescription
- (void)audioFileStream:(TDAudioFileStream *)audioFileStream didReceiveData:(const void *)data packetDescription:(AudioStreamPacketDescription)packetDescription
{
[TDAudioQueueFiller fillAudioQueue:self.audioQueue withData:data length:length packetDescription:packetDescription];
[TDAudioQueueFiller fillAudioQueue:self.audioQueue withData:data packetDescription:packetDescription];
}

#pragma mark - TDAudioQueueDelegate
Expand Down