RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools: use the new AVFrame keyframe flag 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-04-12 19:54:10 -03:00
parent af8db9106c
commit c7a8681860
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fftools/ffmpeg.c
View File

@ -1143,7 +1143,7 @@ static int decode_video(InputStream *ist, const AVPacket *pkt, int *got_output,
av_ts2timestr(best_effort_timestamp, &ist->st->time_base),
av_ts2str(decoded_frame->duration),
av_ts2timestr(decoded_frame->duration, &ist->st->time_base),
decoded_frame->key_frame, decoded_frame->pict_type,
!!(decoded_frame->flags & AV_FRAME_FLAG_KEY), decoded_frame->pict_type,
ist->st->time_base.num, ist->st->time_base.den);
}

6
fftools/ffmpeg_enc.c
View File

@ -1005,11 +1005,11 @@ static enum AVPictureType forced_kf_apply(void *logctx, KeyframeForceCtx *kf,
goto force_keyframe;
}
} else if (kf->type == KF_FORCE_SOURCE &&
in_picture->key_frame == 1 && !dup_idx) {
(in_picture->flags & AV_FRAME_FLAG_KEY) && !dup_idx) {
goto force_keyframe;
} else if (kf->type == KF_FORCE_SOURCE_NO_DROP && !dup_idx) {
kf->dropped_keyframe = 0;
if ((in_picture->key_frame == 1) || kf->dropped_keyframe)
if ((in_picture->flags & AV_FRAME_FLAG_KEY) || kf->dropped_keyframe)
goto force_keyframe;
}
@ -1064,7 +1064,7 @@ static void do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame)
}
}
ost->last_dropped = nb_frames == nb_frames_prev && frame;
ost->kf.dropped_keyframe = ost->last_dropped && frame && frame->key_frame;
ost->kf.dropped_keyframe = ost->last_dropped && frame && (frame->flags & AV_FRAME_FLAG_KEY);
/* duplicates frame if needed */
for (i = 0; i < nb_frames; i++) {

2
fftools/ffprobe.c
View File

@ -2594,7 +2594,7 @@ static void show_frame(WriterContext *w, AVFrame *frame, AVStream *stream,
if (s) print_str ("media_type", s);
else print_str_opt("media_type", "unknown");
print_int("stream_index", stream->index);
print_int("key_frame", frame->key_frame);
print_int("key_frame", !!(frame->flags & AV_FRAME_FLAG_KEY));
print_ts ("pts", frame->pts);
print_time("pts_time", frame->pts, &stream->time_base);
print_ts ("pkt_dts", frame->pkt_dts);