Archives
/
notcurses
mirror of https://github.com/dankamongmen/notcurses
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: replace deprecated pkt_duration with duration #2688

Browse Source
pull/2769/head
nick black 3 months ago
parent fb7b132551
commit 9d4c9e0083
No known key found for this signature in database
GPG Key ID: 5F43400C21CBFACC
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
src/media/ffmpeg.c
Unescape Escape View File

@ -76,7 +76,7 @@ print_frame_summary(const AVCodecContext* cctx, const AVFrame* f){
} }
fprintf(stderr, " PTS %" PRId64 " Flags: 0x%04x\n", f->pts, f->flags); fprintf(stderr, " PTS %" PRId64 " Flags: 0x%04x\n", f->pts, f->flags);
fprintf(stderr, " %" PRIu64 "ms@%" PRIu64 "ms (%skeyframe) qual: %d\n", fprintf(stderr, " %" PRIu64 "ms@%" PRIu64 "ms (%skeyframe) qual: %d\n",
f->pkt_duration, // FIXME in 'time_base' units f->duration, // FIXME in 'time_base' units
f->best_effort_timestamp, f->best_effort_timestamp,
f->key_frame ? "" : "non-", f->key_frame ? "" : "non-",
f->quality); f->quality);
@ -485,7 +485,7 @@ ffmpeg_stream(notcurses* nc, ncvisual* ncv, float timescale,
clock_gettime(CLOCK_MONOTONIC, &begin); clock_gettime(CLOCK_MONOTONIC, &begin);
uint64_t nsbegin = timespec_to_ns(&begin); uint64_t nsbegin = timespec_to_ns(&begin);
//bool usets = false; //bool usets = false;
// each frame has a pkt_duration in milliseconds. keep the aggregate, in case // each frame has a duration in units of time_base. keep the aggregate, in case
// we don't have PTS available. // we don't have PTS available.
uint64_t sum_duration = 0; uint64_t sum_duration = 0;
ncplane* newn = NULL; ncplane* newn = NULL;
@ -519,7 +519,7 @@ ffmpeg_stream(notcurses* nc, ncvisual* ncv, float timescale,
if(activevopts.n != newn){ if(activevopts.n != newn){
activevopts.n = newn; activevopts.n = newn;
} }
uint64_t duration = ncv->details->frame->pkt_duration * tbase * NANOSECS_IN_SEC; uint64_t duration = ncv->details->frame->duration * tbase * NANOSECS_IN_SEC;
double schedns = nsbegin; double schedns = nsbegin;
sum_duration += (duration * timescale); sum_duration += (duration * timescale);
schedns += sum_duration; schedns += sum_duration;

Write Preview
Loading…
Cancel
Save