Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package voctomix-outcasts, it's a fringe package only
used by some conference video setups, which requested fixes for these
bugs:
voctomix-outcasts (0.8.0-1) unstable; urgency=medium
* New upstream release, which does not exit with error on EOS.
Closes: #926828.
* Recommend gstreamer1.0-alsa for USB microphones. Closes: #926829.
Sadly the debdiff is a bit of noisy because the new upstream release
included a few silly whitespace changes. I still think it's trivial to
review though. The tests are tests.
$ debdiff voctomix-outcasts_0.7.0-1.dsc voctomix-outcasts_0.8.0-1.dsc |diffstat
configs/test1.ini | 4 ----
debian/changelog | 8 ++++++++
debian/control | 5 ++++-
ingest.py | 9 +++++----
record-mixed-av.sh | 10 ++++++++--
tests/mock-stack.sh | 11 ++++++-----
tests/show_hdmi2usb.sh | 13 ++++++++++---
7 files changed, 41 insertions(+), 19 deletions(-)
As usual the full debdiff is attached.
--
thanks,
Holger
-------------------------------------------------------------------------------
holger@(debian|reproducible-builds|layer-acht).org
PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C
diff -Nru voctomix-outcasts-0.7.0/configs/test1.ini voctomix-outcasts-0.8.0/configs/test1.ini
--- voctomix-outcasts-0.7.0/configs/test1.ini 2018-08-26 18:35:26.000000000 +0200
+++ voctomix-outcasts-0.8.0/configs/test1.ini 2019-04-11 14:13:40.000000000 +0200
@@ -13,8 +13,6 @@
[grabber]
port=10002
-
-
[mainvideo]
playaudio=true
@@ -27,5 +25,3 @@
system=xv
# system=x
-[extra]
-foo=bar
diff -Nru voctomix-outcasts-0.7.0/debian/changelog voctomix-outcasts-0.8.0/debian/changelog
--- voctomix-outcasts-0.7.0/debian/changelog 2019-01-19 05:03:34.000000000 +0100
+++ voctomix-outcasts-0.8.0/debian/changelog 2019-04-11 14:18:57.000000000 +0200
@@ -1,3 +1,11 @@
+voctomix-outcasts (0.8.0-1) unstable; urgency=medium
+
+ * New upstream release, which does not exit with error on EOS.
+ Closes: #926828.
+ * Recommend gstreamer1.0-alsa for USB microphones. Closes: #926829.
+
+ -- Holger Levsen <holger@debian.org> Thu, 11 Apr 2019 14:18:57 +0200
+
voctomix-outcasts (0.7.0-1) unstable; urgency=medium
[ Stefano Rivera ]
diff -Nru voctomix-outcasts-0.7.0/debian/control voctomix-outcasts-0.8.0/debian/control
--- voctomix-outcasts-0.7.0/debian/control 2019-01-19 04:45:40.000000000 +0100
+++ voctomix-outcasts-0.8.0/debian/control 2019-04-11 14:17:20.000000000 +0200
@@ -18,7 +18,10 @@
python3-gi,
${misc:Depends},
${python3:Depends}
-Recommends: gstreamer1.0-x, python3-usb
+Recommends:
+ gstreamer1.0-alsa,
+ gstreamer1.0-x,
+ python3-usb,
Description: Additional scripts to be used with Voctomix
A collection of helper scripts for Voctomix, which have not been included
in Voctomix itself.
diff -Nru voctomix-outcasts-0.7.0/ingest.py voctomix-outcasts-0.8.0/ingest.py
--- voctomix-outcasts-0.7.0/ingest.py 2019-01-19 02:18:57.000000000 +0100
+++ voctomix-outcasts-0.8.0/ingest.py 2019-04-11 14:13:40.000000000 +0200
@@ -151,7 +151,7 @@
video_src = """
videotestsrc name=videosrc {attribs} !
clockoverlay
- text="Source:{hostname}\nCaps:{videocaps}\nAttribs:{attribs}\n"
+ text="Source: {hostname}\nCaps: {videocaps}\nAttribs: {attribs}\n"
halignment=left line-alignment=left !
{monitor}
"""
@@ -194,8 +194,8 @@
"""
elif args.audio_source == 'file':
- # this only works if video is from DV also.
- # or some gst source that gets demux ed
+ # this only works if video is from ...
+ # some gst source that gets demux ed, I guess.
audio_src = """
src. !
queue !
@@ -275,6 +275,7 @@
print(pipeline)
if args.debug:
+ # print something to run in a shell
gst_cmd = "gst-launch-1.0 {}".format(pipeline)
# escape the ! because bash
@@ -342,7 +343,7 @@
def on_eos(bus, message):
print('Received EOS-Signal')
- sys.exit(1)
+ sys.exit(0)
def on_error(bus, message):
print('Received Error-Signal')
diff -Nru voctomix-outcasts-0.7.0/record-mixed-av.sh voctomix-outcasts-0.8.0/record-mixed-av.sh
--- voctomix-outcasts-0.7.0/record-mixed-av.sh 2018-08-26 18:35:26.000000000 +0200
+++ voctomix-outcasts-0.8.0/record-mixed-av.sh 2019-04-11 14:13:40.000000000 +0200
@@ -7,14 +7,20 @@
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
-#
+#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
-# $1 - destination dir. default: ~/Videos
+# $1 - destination dir. default: ~/Videos
# files will be $dest_dir/$date/$time.gs.ts
# (.gs to keep these apart from the files created by record-timestamp.sh)
+# NB: does not chunk files. keeps saving untill the process is killed.
+
+# TODO: https://gstreamer.freedesktop.org/data/doc/gstreamer/head/gst-plugins-good/html/gst-plugins-good-plugins-splitmuxsink.html
+
+# splitmuxsink — Muxer wrapper for splitting output stream by size or time
+
dest_dir=${1:-~/Videos}/$(date +%Y-%m-%d)
mkdir -p $dest_dir
diff -Nru voctomix-outcasts-0.7.0/tests/mock-stack.sh voctomix-outcasts-0.8.0/tests/mock-stack.sh
--- voctomix-outcasts-0.7.0/tests/mock-stack.sh 2018-08-26 18:35:26.000000000 +0200
+++ voctomix-outcasts-0.8.0/tests/mock-stack.sh 2019-04-11 14:13:40.000000000 +0200
@@ -3,10 +3,14 @@
# core server
gst-launch-1.0 \
tcpserversrc host=127.0.0.1 port=4953 ! \
- queue ! \
+ queue ! matroskaparse ! \
tcpserversink host=127.0.0.1 port=4954 \
& srv=$!
sleep 1
+function finish {
+ kill $srv 2> /dev/null
+}
+trap finish EXIT
# test source client
gst-launch-1.0 \
@@ -35,7 +39,4 @@
queue !\
mux. \
mpegtsmux name=mux !\
- filesink location="/tmp/test.ts" \
-
-kill $srv
-
+ filesink location="/tmp/test.ts"
diff -Nru voctomix-outcasts-0.7.0/tests/show_hdmi2usb.sh voctomix-outcasts-0.8.0/tests/show_hdmi2usb.sh
--- voctomix-outcasts-0.7.0/tests/show_hdmi2usb.sh 2018-08-26 18:35:26.000000000 +0200
+++ voctomix-outcasts-0.8.0/tests/show_hdmi2usb.sh 2019-04-11 14:13:40.000000000 +0200
@@ -1,8 +1,15 @@
-#!/bin/bash -ex
+#!/bin/bash -x
gst-launch-1.0 \
- v4l2src device=/dev/video1 !\
- jpegdec !\
+ -v \
+ v4l2src device=/dev/$1 !\
+ decodebin !\
queue ! videoconvert !\
fpsdisplaysink sync=false
+ # video/raw,width=1280,height=720 !\
+ # video/raw,width=1280,height=960 !\
+ # jpegdec !\
+ # decodebin !\
+ # video/x-raw, format=(string)YUY2, width=(int)1920, height=(int)1080, pixel-aspect-ratio=(fraction)1/1, interlace-mode=(string)progressive, colorimetry=(string)2:4:7:1, framerate=(fraction)5/1'
+ # video/x-raw, format=YUY2, width=1920, height=1080, pixel-aspect-ratio=1/1, interlace-mode=progressive, colorimetry=2:4:7:1, framerate=5/1 !\
Attachment:
signature.asc
Description: PGP signature