Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg: replace stream timebase with decoded frame one

Browse Source 
They are the same for now, but this may change in the future.
pull/389/head
Anton Khirnov 2 years ago
parent 1372e81aaa
commit 7b41785eb6
1 changed files with 6 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      fftools/ffmpeg.c

12
fftools/ffmpeg.c
Unescape View File

@ -993,7 +993,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr
AVRational field_rate = av_mul_q(ist->dec_ctx->framerate, AVRational field_rate = av_mul_q(ist->dec_ctx->framerate,
(AVRational){ 2, 1 }); (AVRational){ 2, 1 });
codec_duration = av_rescale_q(fields, av_inv_q(field_rate), codec_duration = av_rescale_q(fields, av_inv_q(field_rate),
ist->st->time_base); frame->time_base);
} }
// prefer codec-layer duration for containers without timestamps // prefer codec-layer duration for containers without timestamps
@ -1015,7 +1015,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr
// try average framerate // try average framerate
if (ist->st->avg_frame_rate.num && ist->st->avg_frame_rate.den) { if (ist->st->avg_frame_rate.num && ist->st->avg_frame_rate.den) {
int64_t d = av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate), int64_t d = av_rescale_q(1, av_inv_q(ist->st->avg_frame_rate),
ist->st->time_base); frame->time_base);
if (d > 0) if (d > 0)
return d; return d;
} }
@ -1110,13 +1110,13 @@ static int decode_video(InputStream *ist, const AVPacket *pkt, int *got_output,
"duration:%s duration_time:%s " "duration:%s duration_time:%s "
"keyframe:%d frame_type:%d time_base:%d/%d\n", "keyframe:%d frame_type:%d time_base:%d/%d\n",
av_ts2str(frame->pts), av_ts2str(frame->pts),
av_ts2timestr(frame->pts, &ist->st->time_base), av_ts2timestr(frame->pts, &frame->time_base),
av_ts2str(frame->pkt_dts), av_ts2str(frame->pkt_dts),
av_ts2timestr(frame->pkt_dts, &ist->st->time_base), av_ts2timestr(frame->pkt_dts, &frame->time_base),
av_ts2str(frame->duration), av_ts2str(frame->duration),
av_ts2timestr(frame->duration, &ist->st->time_base), av_ts2timestr(frame->duration, &frame->time_base),
!!(frame->flags & AV_FRAME_FLAG_KEY), frame->pict_type, !!(frame->flags & AV_FRAME_FLAG_KEY), frame->pict_type,
ist->st->time_base.num, ist->st->time_base.den); frame->time_base.num, frame->time_base.den);
} }
if (ist->st->sample_aspect_ratio.num) if (ist->st->sample_aspect_ratio.num)

Write Preview
Loading…
Cancel
Save