diff --git a/.gitignore b/.gitignore index 46ef89f..1c97a33 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /os-autoinst-1c7bb3f56f09b4ee902cd4632c7dc134cb315499.tar.gz /os-autoinst-ab8eedab3cbf930dafd1c0c69133d8c52e872bb4.tar.gz /os-autoinst-f5d91659fd74b634d31681437f7bd6f7ead6bc41.tar.gz +/os-autoinst-44e93d8dfa546da132a7127a0edf0656cc3e0807.tar.gz diff --git a/1059.patch b/1059.patch deleted file mode 100644 index ffc6836..0000000 --- a/1059.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5e7d1ec0f6aa3e1627bd4ee959d8470dea2159d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Wed, 7 Nov 2018 21:17:01 +0100 -Subject: [PATCH] Use video captions to overlay wallclock time - -Although durations and absolute time can be somewhat derived using the -framerate (it is captured with nominally 2 fps), this is cumbersome and -not always correct. There are occasional frame drops due to stalls or long -running screen matches, especially on e.g. aarch64. - -Create a caption file which shows the same time stamps as the autoinst.log, -these can be overlaid over the actual video. - -See poo#42050 for details. ---- - backend/baseclass.pm | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/backend/baseclass.pm b/backend/baseclass.pm -index f1e4ed0ad..1330594a8 100644 ---- a/backend/baseclass.pm -+++ b/backend/baseclass.pm -@@ -307,6 +307,9 @@ sub start_encoder { - - $self->{encoder_pipe}->blocking(0); - -+ open($self->{vtt_caption_file}, '>', "$cwd/video_time.vtt"); -+ $self->{vtt_caption_file}->print("WEBVTT\n"); -+ - return; - } - -@@ -404,6 +407,22 @@ sub cpu_stat { - return []; - } - -+sub format_vtt_timestamp { -+ my ($self, $walltime) = @_; -+ -+ my $frametime_ms = 1000 * $self->{video_frame_number} / 24; -+ my $caption = "\n$self->{video_frame_number}\n"; -+ # presentation time span (one frame) -+ $caption .= sprintf(POSIX::strftime("%T.%%03d", gmtime($frametime_ms / 1000)), $frametime_ms % 1000); -+ $frametime_ms += 1000 / 24; -+ $caption .= " --> "; -+ $caption .= sprintf(POSIX::strftime("%T.%%03d\n", gmtime($frametime_ms / 1000)), $frametime_ms % 1000); -+ # clock value as caption text -+ $caption .= sprintf(POSIX::strftime("[%FT%T.%%03d]\n", localtime($walltime)), 1000 * ($walltime - int($walltime))); -+ -+ return $caption; -+} -+ - sub enqueue_screenshot { - my ($self, $image) = @_; - -@@ -427,6 +446,8 @@ sub enqueue_screenshot { - $self->{min_video_similarity} -= 1; - $self->{min_video_similarity} = $sim if $sim < $self->{min_video_similarity}; - -+ $self->{vtt_caption_file}->print($self->format_vtt_timestamp(gettimeofday)); -+ - # we have two different similarity levels - one (slightly higher value, based - # t/data/user-settings-*) to determine if it's worth it to recheck needles - # and one (slightly lower as less significant) determining if we write the frame diff --git a/os-autoinst.spec b/os-autoinst.spec index 71967dd..a7c5d2d 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -23,22 +23,19 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.5 -%global github_commit f5d91659fd74b634d31681437f7bd6f7ead6bc41 +%global github_commit 44e93d8dfa546da132a7127a0edf0656cc3e0807 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20181119 +%global github_date 20181213 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 9%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 10%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ Group: Development/System URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz -# Output a video caption file to overlay wallclock time on videos -# https://github.com/os-autoinst/os-autoinst/pull/1059 -Patch0: 1059.patch BuildRequires: autoconf BuildRequires: automake @@ -227,6 +224,9 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog +* Tue Dec 18 2018 Adam Williamson - 4.5-10.20181213git44e93d8 +- Bump to latest git again, drop backported patch + * Mon Nov 19 2018 Adam Williamson - 4.5-9.20181119gitf5d9165 - Bump to latest git again - Backport a patch related to new video timestamp feature diff --git a/sources b/sources index 9e817dd..f671f22 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-f5d91659fd74b634d31681437f7bd6f7ead6bc41.tar.gz) = 7de54010f3b77569b76c988ca4f5599523dcfea4eadccdb0ef7b03be268465411b9f4c097e75669df15a06d1a5712fc114ae1c586a2ea0091aae563f1e6a74f5 +SHA512 (os-autoinst-44e93d8dfa546da132a7127a0edf0656cc3e0807.tar.gz) = c070801cb45dc104a4ae606abb12402bd3ffb0a093bbbcf41a29be2a05709db11b2c2c2589c47bf1e70326a4e7d26fa483a520055b67971ab3231252be268f90