diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index d2d86ca368..40957a3992 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1816,19 +1816,19 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti av_bprintf(&buf, " speed=%4.3gx ", speed); av_bprintf(&buf_script, "speed=%4.3gx\n", speed); } - - float fps; + //get fps + float fps; fps = t > 1 ? frame_number / t : -1; if (fps > 0 && max_frames_hint > 0) { //get remaining frames int64_t remaining_frames = max_frames_hint - frame_number; secs = remaining_frames / fps; - mins = secs / 60; + mins = secs / 60; //secs %= 60 done later hours = mins / 60; mins %= 60; - + //calculate finish date time_t rawtime; struct tm * timeinfo; @@ -1837,17 +1837,17 @@ static void print_report(int is_last_report, int64_t timer_start, int64_t cur_ti time_t time = mktime(timeinfo); time_t timef = time + secs; timeinfo = localtime(&timef); - + secs %= 60; - char* timebuf[64]; - if(timef - time > 86400) - strftime(timebuf, 64, "%F %T", timeinfo); + char* timebuf[20]; //max: 2019-10-10 12:34:00 (18) +1 + if(timef - time > 86400) //longer than one day? + strftime(timebuf, 20, "%F %T", timeinfo); //full information else - strftime(timebuf, 64, "%T", timeinfo); - + strftime(timebuf, 20, "%T", timeinfo); //time only + av_bprintf(&buf, "Remaining=%"PRId64" ETA=%02d:%02d:%02d finish=%s", remaining_frames, hours, mins, secs, timebuf); } - + if (print_stats || is_last_report) { const char end = is_last_report ? '\n' : '\r'; if (print_stats==1 && AV_LOG_INFO > av_log_get_level()) { diff --git a/settings b/settings new file mode 100644 index 0000000000..ea4b0030f1 --- /dev/null +++ b/settings @@ -0,0 +1,4 @@ +sudo apt install libopenmpt-dev libopenjp2-7-dev librsvg2-dev librubberband-dev libsnappy-dev libspeex-dev libtheora-dev libtwolame-dev libzvbi-dev libavdevice-dev + +./configure --prefix=/usr --extra-version=0ubuntu0.18.04.1 --toolchain=hardened --libdir=/usr/lib/x86_64-linux-gnu --incdir=/usr/include/x86_64-linux-gnu --enable-gpl --disable-stripping --enable-avresample --enable-avisynth --enable-gnutls --enable-ladspa --enable-libass --enable-libbluray --enable-libbs2b --enable-libcaca --enable-libfontconfig --enable-libfreetype --enable-libfribidi --enable-libgme --enable-libgsm --enable-libmp3lame --enable-libopenjpeg --enable-libopenmpt --enable-libopus --enable-libpulse --enable-librubberband --enable-librsvg --enable-libshine --enable-libsnappy --enable-libsoxr --enable-libspeex --enable-libssh --enable-libtheora --enable-libtwolame --enable-libvorbis --enable-libvpx --enable-libwavpack --enable-libwebp --enable-libx265 --enable-libxml2 --enable-libxvid --enable-libzvbi --enable-sdl2 --enable-libdc1394 --enable-libdrm --enable-chromaprint --enable-frei0r --enable-libx264 +