experiment with transporting uncompressed a/v together in a matroska stream

3 files changed, 0 insertions, 170 deletions

diff --git a/voctocore/lib/audio/mix.py b/voctocore/lib/audio/mix.py
deleted file mode 100644
index bd803b2..0000000
--- a/voctocore/lib/audio/mix.py
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/python3
-import logging
-from gi.repository import Gst
-from enum import Enum
-
-from lib.config import Config
-
-class AudioMix(object):
-	log = logging.getLogger('VideoMix')
-
-	mixingPipeline = None
-
-	caps = None
-	names = []
-
-	selectedSource = 0
-
-	def __init__(self):
-		pass
diff --git a/voctocore/lib/audio/rawoutput.py b/voctocore/lib/audio/rawoutput.py
deleted file mode 100644
index e268827..0000000
--- a/voctocore/lib/audio/rawoutput.py
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/python3
-import logging, socket
-from gi.repository import GObject, Gst
-
-from lib.config import Config
-
-class AudioRawOutput(object):
-	log = logging.getLogger('AudioRawOutput')
-
-	name = None
-	port = None
-	caps = None
-
-	boundSocket = None
-	receiverPipeline = None
-
-	currentConnections = []
-
-	def __init__(self, channel, port, caps):
-		self.log = logging.getLogger('AudioRawOutput['+channel+']')
-
-		self.channel = channel
-		self.port = port
-		self.caps = caps
-
-		pipeline = """
-			interaudiosrc channel={channel} !
-			{caps} !
-			gdppay !
-			multifdsink resend-streamheader=false name=fd
-		""".format(
-			channel=self.channel,
-			caps=self.caps
-		)
-		self.log.debug('Launching Pipeline:\n%s', pipeline)
-		self.receiverPipeline = Gst.parse_launch(pipeline)
-		self.receiverPipeline.bus.add_signal_watch()
-		self.receiverPipeline.set_state(Gst.State.PLAYING)
-
-		self.log.debug('Binding to Mirror-Socket on [::]:%u', port)
-		self.boundSocket = socket.socket(socket.AF_INET6)
-		self.boundSocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-		self.boundSocket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, False)
-		self.boundSocket.bind(('::', port))
-		self.boundSocket.listen(1)
-
-		self.log.debug('Setting GObject io-watch on Socket')
-		GObject.io_add_watch(self.boundSocket, GObject.IO_IN, self.on_connect)
-
-	def on_connect(self, sock, *args):
-		conn, addr = sock.accept()
-		self.log.info("Incomming Connection from %s", addr)
-
-		self.log.info('Adding fd %u to multifdsink', conn.fileno())
-		self.receiverPipeline.get_by_name('fd').emit('add', conn.fileno())
-
-		self.currentConnections.append(conn)
-		self.log.info('Now %u Receiver connected', len(self.currentConnections))
-
-		return True
-
-	def disconnect(self, receiverPipeline, currentConnection):
-		self.currentConnections.remove(currentConnection)
-		self.log.info('Disconnected Receiver, now %u Receiver connected', len(self.currentConnections))
diff --git a/voctocore/lib/audio/src.py b/voctocore/lib/audio/src.py
deleted file mode 100644
index 03c7bcc..0000000
--- a/voctocore/lib/audio/src.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/python3
-import logging, socket
-from gi.repository import GObject, Gst
-
-from lib.config import Config
-
-class AudioSrc(object):
-	log = logging.getLogger('AudioSrc')
-
-	name = None
-	port = None
-	caps = None
-
-	receiverPipeline = None
-
-	boundSocket = None
-	currentConnection = None
-
-	def __init__(self, name, port, caps):
-		self.log = logging.getLogger('AudioSrc['+name+']')
-
-		self.name = name
-		self.port = port
-		self.caps = caps
-
-		self.log.debug('Binding to Source-Socket on [::]:%u', port)
-		self.boundSocket = socket.socket(socket.AF_INET6)
-		self.boundSocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-		self.boundSocket.setsockopt(socket.IPPROTO_IPV6, socket.IPV6_V6ONLY, False)
-		self.boundSocket.bind(('::', port))
-		self.boundSocket.listen(1)
-
-		self.log.debug('Setting GObject io-watch on Socket')
-		GObject.io_add_watch(self.boundSocket, GObject.IO_IN, self.on_connect)
-
-	def on_connect(self, sock, *args):
-		conn, addr = sock.accept()
-		self.log.info("Incomming Connection from %s", addr)
-
-		if self.currentConnection is not None:
-			self.log.warn("Another Source is already connected")
-			return True
-
-		pipeline = """
-			fdsrc fd={fd} !
-			gdpdepay !
-			{caps} !
-			queue !
-			tee name=tee
-
-			tee. ! queue ! interaudiosink channel=audio_{name}_mixer
-			tee. ! queue ! interaudiosink channel=audio_{name}_mirror
-		""".format(
-			fd=conn.fileno(),
-			name=self.name,
-			caps=self.caps
-		)
-		self.log.debug('Launching Source-Receiver-Pipeline:\n%s', pipeline)
-		self.receiverPipeline = Gst.parse_launch(pipeline)
-
-		self.log.debug('Binding End-of-Stream-Signal on Source-Receiver-Pipeline')
-		self.receiverPipeline.bus.add_signal_watch()
-		self.receiverPipeline.bus.connect("message::eos", self.on_eos)
-		self.receiverPipeline.bus.connect("message::error", self.on_error)
-
-		self.receiverPipeline.set_state(Gst.State.PLAYING)
-
-		self.currentConnection = conn
-		return True
-
-	def on_eos(self, bus, message):
-		self.log.info('Received End-of-Stream-Signal on Source-Receiver-Pipeline')
-		if self.currentConnection is not None:
-			self.disconnect()
-
-	def on_error(self, bus, message):
-		self.log.info('Received Error-Signal on Source-Receiver-Pipeline')
-		(code, debug) = message.parse_error()
-		self.log.debug('Error-Details: #%u: %s', code, debug)
-
-		if self.currentConnection is not None:
-			self.disconnect()
-
-	def disconnect(self):
-		self.receiverPipeline.set_state(Gst.State.NULL)
-		self.receiverPipeline = None
-		self.currentConnection = None