diff options
Diffstat (limited to 'voctocore/lib')
| -rw-r--r-- | voctocore/lib/avpreviewoutput.py | 10 | ||||
| -rw-r--r-- | voctocore/lib/avrawoutput.py | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/voctocore/lib/avpreviewoutput.py b/voctocore/lib/avpreviewoutput.py index 04ff637..6b3e3e5 100644 --- a/voctocore/lib/avpreviewoutput.py +++ b/voctocore/lib/avpreviewoutput.py @@ -18,11 +18,6 @@ class AVPreviewOutput(TCPMultiConnection): vcaps_out = Config.get('mix', 'videocaps') pipeline = """ - interaudiosrc channel=audio_{channel} ! - {acaps} ! - queue ! - mux. - intervideosrc channel=video_{channel} ! {vcaps_in} ! videorate ! @@ -32,6 +27,11 @@ class AVPreviewOutput(TCPMultiConnection): queue ! mux. + interaudiosrc channel=audio_{channel} ! + {acaps} ! + queue ! + mux. + matroskamux name=mux streamable=true diff --git a/voctocore/lib/avrawoutput.py b/voctocore/lib/avrawoutput.py index 60d2b37..c465b0e 100644 --- a/voctocore/lib/avrawoutput.py +++ b/voctocore/lib/avrawoutput.py @@ -13,13 +13,13 @@ class AVRawOutput(TCPMultiConnection): self.channel = channel pipeline = """ - interaudiosrc channel=audio_{channel} ! - {acaps} ! + intervideosrc channel=video_{channel} ! + {vcaps} ! queue ! mux. - intervideosrc channel=video_{channel} ! - {vcaps} ! + interaudiosrc channel=audio_{channel} ! + {acaps} ! queue ! mux. |