aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind <git@mazdermind.de>2015-12-20 10:39:37 +0100
committerMaZderMind <git@mazdermind.de>2015-12-20 10:39:37 +0100
commit58ba1440982ebbdd037abf17272d33fcdc87de9a (patch)
tree90e42e439c457aa94bcedbfc50eb0da34217cf88
parentd5ea92d23414a3868e48827a9089a20b3dbc1e82 (diff)
[voctocore][example-scripts] Reverting ea071cf057a00ebe0e20d0787dab59c863fbba6c - changing back to 4:2:0 because the gstreamer-pipelines showed obscure problems with 4:2:2
-rwxr-xr-xexample-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-background-loop.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-decklink-cam1.sh1
-rwxr-xr-xexample-scripts/ffmpeg/source-decklink-cam2.sh1
-rwxr-xr-xexample-scripts/ffmpeg/source-mjpg-framegrabber.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-nostream-pause-loop.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-testvideo-as-cam1.sh2
-rwxr-xr-xexample-scripts/ffmpeg/source-testvideo-as-cam2.sh2
-rw-r--r--voctocore/default-config.ini2
10 files changed, 10 insertions, 8 deletions
diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
index 6fceff1..5c0f47e 100755
--- a/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-avsync-test-clip-as-cam1.sh
@@ -4,6 +4,6 @@ ffmpeg -y \
-vf scale=1920x1080 \
-c:v rawvideo \
-c:a pcm_s16le \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:10000
diff --git a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
index 327b398..c454dd7 100755
--- a/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-avsync-test-clip-looped-as-cam1.sh
@@ -5,6 +5,6 @@ wget -nc -O /tmp/avsync.ts http://c3voc.mazdermind.de/testfiles/avsync.ts
-vf scale=1920x1080 \
-c:v rawvideo \
-c:a pcm_s16le \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:10000
diff --git a/example-scripts/ffmpeg/source-background-loop.sh b/example-scripts/ffmpeg/source-background-loop.sh
index e18617f..00ff35c 100755
--- a/example-scripts/ffmpeg/source-background-loop.sh
+++ b/example-scripts/ffmpeg/source-background-loop.sh
@@ -4,6 +4,6 @@ while true; do cat /tmp/bg.ts || exit 1; done |\
ffmpeg -re -i - \
-map 0:v \
-c:v rawvideo \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:16000
diff --git a/example-scripts/ffmpeg/source-decklink-cam1.sh b/example-scripts/ffmpeg/source-decklink-cam1.sh
index f6e5f8e..e10a9b2 100755
--- a/example-scripts/ffmpeg/source-decklink-cam1.sh
+++ b/example-scripts/ffmpeg/source-decklink-cam1.sh
@@ -3,5 +3,6 @@ ffmpeg -y \
-f decklink \
-i 'DeckLink Mini Recorder (1)@10' \
-c:v rawvideo -c:a pcm_s16le \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:10000
diff --git a/example-scripts/ffmpeg/source-decklink-cam2.sh b/example-scripts/ffmpeg/source-decklink-cam2.sh
index 86137b8..9db4494 100755
--- a/example-scripts/ffmpeg/source-decklink-cam2.sh
+++ b/example-scripts/ffmpeg/source-decklink-cam2.sh
@@ -3,5 +3,6 @@ ffmpeg -y \
-f decklink \
-i 'DeckLink Mini Recorder (2)@10' \
-c:v rawvideo -c:a pcm_s16le \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:10001
diff --git a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
index 502644c..6b47bf7 100755
--- a/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
+++ b/example-scripts/ffmpeg/source-mjpg-framegrabber.sh
@@ -9,6 +9,6 @@ ffmpeg -y \
-map "[a]" \
-c:a pcm_s16le \
-c:v rawvideo \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:10002
diff --git a/example-scripts/ffmpeg/source-nostream-pause-loop.sh b/example-scripts/ffmpeg/source-nostream-pause-loop.sh
index d88eb9d..65b7436 100755
--- a/example-scripts/ffmpeg/source-nostream-pause-loop.sh
+++ b/example-scripts/ffmpeg/source-nostream-pause-loop.sh
@@ -4,6 +4,6 @@ while true; do cat /tmp/pause.ts || exit 1; done |\
ffmpeg -re -i - \
-map 0:v \
-c:v rawvideo \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-f matroska \
tcp://localhost:17000
diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
index 7f88bb7..ef73a08 100755
--- a/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
+++ b/example-scripts/ffmpeg/source-testvideo-as-cam1.sh
@@ -3,7 +3,7 @@ ffmpeg -y \
-i "http://ftp.uni-erlangen.de/cdn.media.ccc.de/broadcast/sendezentrum/h264-hd/31c3-sendezentrum-1013-de-Methodisch_inkorrekt_Die_falsche_42_hd.mp4" \
-ac 2 \
-af aresample=48000 \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-c:v rawvideo \
-c:a pcm_s16le \
-f matroska \
diff --git a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
index b9adc82..7cb795a 100755
--- a/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
+++ b/example-scripts/ffmpeg/source-testvideo-as-cam2.sh
@@ -3,7 +3,7 @@ ffmpeg -y \
-i "http://ftp.uni-erlangen.de/cdn.media.ccc.de/broadcast/sendezentrum/h264-hd/31c3-sendezentrum-1003-de-Freak_Show_FS147_That_Escalatored_Quickly_hd.mp4" \
-ac 2 \
-af aresample=48000 \
- -pix_fmt uyvy422 \
+ -pix_fmt yuv420p \
-c:v rawvideo \
-c:a pcm_s16le \
-f matroska \
diff --git a/voctocore/default-config.ini b/voctocore/default-config.ini
index 04993af..6173822 100644
--- a/voctocore/default-config.ini
+++ b/voctocore/default-config.ini
@@ -1,5 +1,5 @@
[mix]
-videocaps=video/x-raw,format=UYVY,width=1920,height=1080,framerate=25/1,pixel-aspect-ratio=1/1
+videocaps=video/x-raw,format=I420,width=1920,height=1080,framerate=25/1,pixel-aspect-ratio=1/1
audiocaps=audio/x-raw,format=S16LE,channels=2,layout=interleaved,rate=48000
; tcp-ports will be 10000,10001,10002