Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 3b508ce

Browse files
committed
Add MP4Box (gpac) to clean the video credits to @taskworld @dtinth
1 parent dd2cf76 commit 3b508ce

File tree

4 files changed

+26
-20
lines changed

4 files changed

+26
-20
lines changed

CHANGELOG.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@ Note image ids also change after scm-source.json has being updated which trigger
77
###### To get container versions
88
docker exec grid versions
99

10-
## 3.0.1-p9
11-
+ Date: 2017-02-07
10+
## TBD_DOCKER_TAG
11+
+ Date: TBD_DATE
1212
+ Add MP4Box (gpac) to clean the video credits to @taskworld @dtinth
1313
+ Breaking change (videos): Save mp4 instead of mkv
1414
+ Add support for `docker run ... -e HOST_GID=$(id -g) -e HOST_UID=$(id -u)`
1515
+ Image tag details:
16-
+ Selenium 2: 2.53.1 (a36b8b1)
16+
+ Selenium 2: TBD_SELENIUM_2_VERSION (TBD_SELENIUM_2_REVISION)
1717
+ Selenium 3: 3.0.1 (1969d75)
18-
+ Chrome stable: 56.0.2924.87
19-
+ Firefox for Selenium 2: 47.0.1
20-
+ Firefox for Selenium 3: 51.0.1
21-
+ Geckodriver: 0.14.0
22-
+ Chromedriver: 2.27.440175 (9bc1d90b8bfa4dd181fbbf769a5eb5e575574320)
23-
+ Java: OpenJDK Java 1.8.0_121-8u121-b13-0ubuntu1.16.04.2-b13
24-
+ Timezone: Europe/Berlin
25-
+ FROM ubuntu:xenial-20170119
26-
+ Python: 2.7.12
18+
+ Chrome stable: TBD_CHROME_STABLE
19+
+ Firefox for Selenium 2: TBD_FIREFOX_FOR_SEL2
20+
+ Firefox for Selenium 3: TBD_FIREFOX_FOR_SEL3
21+
+ Geckodriver: TBD_GECKO_DRIVER
22+
+ Chromedriver: TBD_CHROME_DRIVER (TBD_CHROMEDRIVER_COMMIT)
23+
+ Java: TBD_JAVA_VENDOR Java TBD_JAVA_BUILD
24+
+ Timezone: TBD_TIME_ZONE
25+
+ FROM ubuntu:UBUNTU_FLAVOR-UBUNTU_DATE
26+
+ Python: TBD_PYTHON_VERSION
2727
+ Tested on kernel dev host: 4.4.0-59-generic x86_64
28-
+ Tested on kernel CI host: 4.4.0-51-generic x86_64
28+
+ Tested on kernel CI host: TBD_HOST_UNAME
2929
+ Built at dev host with: Docker version 1.13.0, build 49bf474
30-
+ Built at CI host with: Docker version 1.13.0, build 49bf474
30+
+ Built at CI host with: Docker version TBD_DOCKER_VERS, build TBD_DOCKER_BUILD
3131
+ Built at dev host with: Docker Compose version 1.10.1, build b252738
32-
+ Built at CI host with: Docker Compose version 1.10.1, build b252738
33-
+ Image size: 1.26 GB
34-
+ Digest: sha256:3c5fdd4e0a1af1f2aacea59e22610d543304d4140670c507ad13c102f6f181eb
35-
+ Image ID: sha256:5fe8b952e8f66406492b21bddca557c764ddb51b7bebdb7500c86f1baf64bcbc
32+
+ Built at CI host with: Docker Compose version TBD_DOCKER_COMPOSE_VERS, build TBD_DOCKER_COMPOSE_BUILD
33+
+ Image size: TBD_IMAGE_SIZE
34+
+ Digest: TBD_DIGEST
35+
+ Image ID: TBD_IMAGE_ID
3636

3737
## 3.0.1-p8
3838
+ Date: 2017-02-02

Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -854,6 +854,7 @@ ENV FIREFOX_VERSION="${FF_VER}" \
854854
RC_CHROME="false" \
855855
RC_FIREFOX="false" \
856856
VIDEO_FILE_EXTENSION="mp4" \
857+
MP4_INTERLEAVES_MEDIA_DATA_CHUNKS_SECS="500" \
857858
VIDEO_FILE_NAME="" \
858859
VIDEO_CHUNK_SECS="00:05:00" \
859860
VIDEO_CHUNKS_MAX=999 \

test/script_scenario_basic

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ echo "# Scenario 1d [basic]: Selenium IDE RC and mount videos"
109109
echo "#==================================================================="
110110

111111
rm -rf ./videos/mounted
112-
mkdir ./videos/mounted
112+
mkdir -p ./videos/mounted
113113
docker run --name=gridrc -d -e VIDEO=true \
114114
-e MOCK_SERVER_HOST="d.host.loc.dev" \
115115
-e MOCK_SERVER_PORT \

video-rec/bin/fix_videos.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ set -e
66
# Optimize for HTTP streaming and fix end time
77
for f in *.mp4; do
88
echo "Optimizing ${f} for HTTP streaming..."
9-
MP4Box -isma -inter 500 ${f}
9+
# -inter Duration : interleaves media data in chunks of
10+
# desired duration (in seconds). This is useful
11+
# to optimize the file for HTTP/FTP streaming
12+
# or reducing disk access.
13+
# https://gpac.wp.imt.fr/mp4box/mp4box-documentation/
14+
MP4Box -isma -inter ${MP4_INTERLEAVES_MEDIA_DATA_CHUNKS_SECS} ${f}
1015
done
1116

1217
# May need to fix perms when mounting volumes

0 commit comments

Comments
 (0)