From f6cb4a1f9b5cac1311fb547ea2d57e2d96b60dc6 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 30 Jun 2024 04:34:07 +0200 Subject: [PATCH] Moved video concat to function. --- README.md | 3 ++- lib/make/msxbuild.mk | 7 +++++++ src/assert-all/0module.mk | 10 ++-------- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index d2e8806..4c69de4 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ When you want to see whats happening do a debug run; real 1m14.043s debug run with video recorder and merge to one video file; - time MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on make -s assert-all-video + time MB_OPENMSX_HEADLESS=off MB_FLIGHT_VIDEO=on make -s assert-all real 0m7.136s build parallel; @@ -165,6 +165,7 @@ Current set is WIP. * mb_unix2dos * mb_dos2unix * mb_create_dist +* mb_create_flight_video ## Errata diff --git a/lib/make/msxbuild.mk b/lib/make/msxbuild.mk index 6a63e54..27082d5 100644 --- a/lib/make/msxbuild.mk +++ b/lib/make/msxbuild.mk @@ -14,6 +14,7 @@ MB_FLIGHT_VIDEO ?= off MB_FLIGHT_PREFIX ?= msxbuild MB_FLIGHT_SEPERATOR ?= - MB_FLIGHT_RECORD_FLAG ?= -doublesize +MB_FLIGHT_VIDEO_NAME ?= flight-video # OS cmds ifeq ($(OS),Windows_NT) @@ -68,6 +69,12 @@ define mb_create_dist @echo === Creating distribution archive. tar -czf $(1) -C $(2) `ls $(2)` endef +define mb_create_flight_video + @echo === Indexing flight videos + ls -1tr $(1)/*-omsx/videos/*.avi | awk -F "$(1)/" -v s="file '" -v e="'" '{print s$$2e}' > $(1)/$(MB_FLIGHT_VIDEO_NAME).lst + ffmpeg -v quiet -y -f concat -i $(1)/$(MB_FLIGHT_VIDEO_NAME)lst -c copy $(1)/$(MB_FLIGHT_VIDEO_NAME).avi + @echo === Flight video completed +endef # Include extra features include $(PATH_MSXBUILD)/lib/make/mb_sdcc.mk diff --git a/src/assert-all/0module.mk b/src/assert-all/0module.mk index 330696f..5a68811 100644 --- a/src/assert-all/0module.mk +++ b/src/assert-all/0module.mk @@ -1,5 +1,5 @@ -BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\)\\n\\t* assert-all-video \(Merges all videos\) +BUILD_HELP += \\n\\t* assert-all \(Run all assertion tests\) ASSERT_ALL_DEPS := \ bin/ahello-m80-test/@assert \ bin/ahello-sdcc-test/@assert \ @@ -11,10 +11,4 @@ bin/dist-qa-msxhub/@assert .PHONY: assert-all assert-all: | $(ASSERT_ALL_DEPS) @echo === All assertions completed - -.PHONY: assert-all-video -assert-all-video: | assert-all - @echo === Build session video listing - ls -1tr bin/*-omsx/videos/msxbuild-*.avi | awk -F "bin/" -v s="file '" -v e="'" '{print s$$2e}' > bin/video-merge.lst - ffmpeg -v quiet -y -f concat -i bin/video-merge.lst -c copy bin/video-session.avi - @echo === Concatted video completed + $(if $(filter on,$(MB_FLIGHT_VIDEO)),$(call mb_create_flight_video,$(PATH_BIN)))