chris/Cog
2
1
Fork 0
Code Issues 65 Pull requests Projects Releases Packages Wiki Activity Actions

[FFmpeg] Fix chapter handling and seeking

Browse source 
Fix chapter startup, and chapter seeking.

Signed-off-by: Christopher Snowhill <kode54@gmail.com>
This commit is contained in:
Christopher Snowhill 2022-06-25 02:36:14 -07:00
parent 1f56e5ef5a
commit cb2ce5675a
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Plugins/FFMPEG/FFMPEGDecoder.h
View file

@ -32,6 +32,7 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence);
int subsong; int subsong;
int64_t startTime; int64_t startTime;
int64_t endTime; int64_t endTime;
BOOL seekedToStart;
@private @private
unsigned char *buffer; unsigned char *buffer;

8
Plugins/FFMPEG/FFMPEGDecoder.m
View file

@ -463,6 +463,8 @@ static uint8_t reverse_bits[0x100];
seekable = [s seekable]; seekable = [s seekable];
seekedToStart = !seekable;
artist = @""; artist = @"";
albumartist = @""; albumartist = @"";
album = @""; album = @"";
@ -684,6 +686,10 @@ static uint8_t reverse_bits[0x100];
} }
- (int)readAudio:(void *)buf frames:(UInt32)frames { - (int)readAudio:(void *)buf frames:(UInt32)frames {
if(!seekedToStart) {
[self seek:0];
}
int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8); int frameSize = rawDSD ? channels : channels * (bitsPerSample / 8);
int bytesToRead = frames * frameSize; int bytesToRead = frames * frameSize;
int bytesRead = 0; int bytesRead = 0;
@ -914,6 +920,8 @@ static uint8_t reverse_bits[0x100];
if(!totalFrames) if(!totalFrames)
return -1; return -1;
seekedToStart = YES;
prebufferedAudio = 0; prebufferedAudio = 0;
if(frame >= totalFrames) { if(frame >= totalFrames) {