From 2285fef4c52dabab97d44a3f102889c0cde5165a Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Sun, 11 Mar 2018 16:05:52 +0100
Subject: Do not set VLC sout option in libvlc_new

---
 src/VLCInput.cpp | 57 +++++++++++++++++++++++++++++---------------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

(limited to 'src/VLCInput.cpp')

diff --git a/src/VLCInput.cpp b/src/VLCInput.cpp
index fac734e..70af724 100644
--- a/src/VLCInput.cpp
+++ b/src/VLCInput.cpp
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------
- * Copyright (C) 2017 Matthias P. Braendli
+ * Copyright (C) 2018 Matthias P. Braendli
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -159,29 +159,6 @@ void VLCInput::prepare()
     }
 
     // VLC options
-    std::stringstream transcode_options_ss;
-    transcode_options_ss << "acodec=fl32";
-    transcode_options_ss << ",samplerate=" << m_rate;
-    if (not m_gain.empty()) {
-        transcode_options_ss << ",afilter=compressor";
-    }
-    string transcode_options = transcode_options_ss.str();
-
-    char smem_options[512];
-    snprintf(smem_options, sizeof(smem_options),
-            "#transcode{%s}:"
-            // We are using transcode because smem only support raw audio and
-            // video formats
-            "smem{"
-                "audio-postrender-callback=%lld,"
-                "audio-prerender-callback=%lld,"
-                "audio-data=%lld"
-            "}",
-            transcode_options.c_str(),
-            handleStream_address,
-            prepareRender_address,
-            (long long int)(intptr_t)this);
-
     vector<string> vlc_args;
     vlc_args.push_back("--verbose=" + to_string(m_verbosity));
 
@@ -193,9 +170,6 @@ void VLCInput::prepare()
         vlc_args.push_back("--compressor-makeup=" + m_gain);
     }
 
-    vlc_args.push_back("--sout");
-    vlc_args.push_back(smem_options); // Stream to memory
-
     copy(m_additional_opts.begin(), m_additional_opts.end(),
             back_inserter(vlc_args));
 
@@ -223,6 +197,35 @@ void VLCInput::prepare()
     // Load the media
     libvlc_media_t *m;
     m = libvlc_media_new_location(m_vlc, m_uri.c_str());
+
+    std::stringstream transcode_options_ss;
+    transcode_options_ss << "acodec=fl32";
+    transcode_options_ss << ",samplerate=" << m_rate;
+    if (not m_gain.empty()) {
+        transcode_options_ss << ",afilter=compressor";
+    }
+    string transcode_options = transcode_options_ss.str();
+
+    char smem_options[512];
+    snprintf(smem_options, 511,
+            ":sout=#transcode{%s}:"
+            // We are using transcode because smem only support raw audio and
+            // video formats
+            "smem{"
+                "audio-postrender-callback=%lld,"
+                "audio-prerender-callback=%lld,"
+                "audio-data=%lld"
+            "}",
+            transcode_options.c_str(),
+            handleStream_address,
+            prepareRender_address,
+            (long long int)(intptr_t)this);
+
+    if (m_verbosity) {
+        fprintf(stderr, "Setting VLC media option: %s\n", smem_options);
+    }
+
+    libvlc_media_add_option(m, smem_options);
     m_mp = libvlc_media_player_new_from_media(m);
     libvlc_media_release(m);
 
-- 
cgit v1.2.3