kode54
/
cog
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

FFmpeg: Handle preroll skip manually

CQTexperiment
Christopher Snowhill 2022-01-24 06:07:09 -08:00
parent d771a58e69
commit fee7fcdb21
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Plugins/FFMPEG/FFMPEGDecoder.h
View File

@ -36,6 +36,7 @@
int bytesConsumedFromDecodedFrame; int bytesConsumedFromDecodedFrame;
BOOL readNextPacket; BOOL readNextPacket;
int64_t seekFrame; int64_t seekFrame;
int64_t skipSamples;
BOOL endOfStream; BOOL endOfStream;
BOOL endOfAudio; BOOL endOfAudio;
} }

13
Plugins/FFMPEG/FFMPEGDecoder.m
View File

@ -262,6 +262,9 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence)
av_dict_free(&dict); av_dict_free(&dict);
// Bah, their skipping is broken
codecCtx->flags2 |= AV_CODEC_FLAG2_SKIP_MANUAL;
lastDecodedFrame = av_frame_alloc(); lastDecodedFrame = av_frame_alloc();
av_frame_unref(lastDecodedFrame); av_frame_unref(lastDecodedFrame);
lastReadPacket = malloc(sizeof(AVPacket)); lastReadPacket = malloc(sizeof(AVPacket));
@ -405,10 +408,16 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence)
totalFrames = av_rescale_q(stream->duration, stream->time_base, tb); totalFrames = av_rescale_q(stream->duration, stream->time_base, tb);
bitrate = (int)((codecCtx->bit_rate) / 1000); bitrate = (int)((codecCtx->bit_rate) / 1000);
framesRead = 0; framesRead = 0;
seekFrame = 0; // Skip preroll if necessary
endOfStream = NO; endOfStream = NO;
endOfAudio = NO; endOfAudio = NO;
if (stream->start_time && stream->start_time != AV_NOPTS_VALUE)
skipSamples = av_rescale_q(stream->start_time, stream->time_base, tb);
if (skipSamples < 0)
skipSamples = 0;
seekFrame = skipSamples; // Skip preroll if necessary
if ( totalFrames < 0 ) if ( totalFrames < 0 )
totalFrames = 0; totalFrames = 0;
@ -626,7 +635,7 @@ int64_t ffmpeg_seek(void *opaque, int64_t offset, int whence)
readNextPacket = YES; // so we immediately read next packet readNextPacket = YES; // so we immediately read next packet
bytesConsumedFromDecodedFrame = INT_MAX; // so we immediately begin decoding next frame bytesConsumedFromDecodedFrame = INT_MAX; // so we immediately begin decoding next frame
framesRead = frame; framesRead = frame;
seekFrame = frame; seekFrame = frame + skipSamples;
endOfStream = NO; endOfStream = NO;
endOfAudio = NO; endOfAudio = NO;