oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed issue of stuttering video with some sources

Browse Source
This commit is contained in:
itsmattkc
2018-11-23 21:20:11 +11:00
parent 4a7abcdeaa
commit ad441b38e3
5 changed files with 95 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
playback/cacher.cpp
+4 -4
View File
@@ -446,9 +446,9 @@ void cache_video_worker(Clip* c, long playhead) {
smallest_pts = target_pts;
}
/*if (c->multithreaded && c->cacher->interrupt) { // ignore interrupts for now
if (c->multithreaded && c->cacher->interrupt) { // ignore interrupts for now
c->cacher->interrupt = false;
}*/
}
while (true) {
AVFrame* frame = av_frame_alloc();
@@ -556,7 +556,7 @@ void reset_cache(Clip* c, long target_frame) {
c->queue_clear();
// seeks to nearest keyframe (target_frame represents internal clip frame)
int64_t target_ts = seconds_to_timestamp(c, playhead_to_clip_seconds(c, target_frame));
int64_t target_ts = seconds_to_timestamp(c, playhead_to_clip_seconds(c, target_frame));
int64_t seek_ts = target_ts;
int64_t timebase_half_second = qRound64(av_q2d(av_inv_q(c->stream->time_base)));
if (c->reverse) seek_ts -= timebase_half_second;
@@ -574,7 +574,7 @@ void reset_cache(Clip* c, long target_frame) {
if (ret < 0) {
dout << "[WARNING] Seeking terminated prematurely";
break;
}
}
if (c->frame->pts <= target_ts) {
c->use_existing_frame = true;
break;
playback/playback.cpp
+2 -1
View File
@@ -189,13 +189,14 @@ void get_clip_frame(Clip* c, long playhead) {
#endif
c->reached_end = false;
cache = false;
} else if (target_pts < target_frame->pts || pts_diff > second_pts) {
} else if (target_pts != c->last_invalid_ts && (target_pts < target_frame->pts || pts_diff > second_pts)) {
#ifdef GCF_DEBUG
dout << "GCF ==> RESET" << target_pts << "(" << target_frame->pts << "-" << target_frame->pts+target_frame->pkt_duration << ")";
#endif
// target_frame = NULL;
reset = true;
c->last_invalid_ts = target_pts;
} else {
#ifdef GCF_DEBUG
dout << "GCF ==> WAIT - target pts:" << target_pts << "closest frame:" << target_frame->pts;