Merge pull request #59 from WatchBeam/light-saber

Light saber

Author: sslivins

.gitignore

@@ -42,6 +42,7 @@ build_scripts/
 *.vcxproj.filters
 *.sln
 *.db
+*db-wal
 
 
 /other/

build_scripts/build_tachyon_windows_vs.bat

@@ -1,7 +1,7 @@
 REM check for cef binary
 REM check for dependencies (ffmpeg, etc)
 SET build_config=Release
-SET obs_version=1.2.14
+SET obs_version=1.2.15
 SET cef_binary_dir=C:\beam\cef_binary
 SET cef_release_dir=C:\beam\obs-browser-1.22
 SET coredeps=C:\beam\tachyon_deps
@@ -30,7 +30,7 @@ cd ..
 call git submodule update --init
 cd ..
 echo "building libftl"
-call git clone https://github.com/WatchBeam/ftl-sdk.git 
+call git clone https://github.com/WatchBeam/ftl-sdk.git
 cd ftl-sdk
 mkdir build
 cd build

build_scripts/tachyon_windows_installer.nsi

@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Tachyon"
 !define DEFAULT_INST_DIR "$PROGRAMFILES\${PRODUCT_NAME}"
-!define PRODUCT_VERSION "1.2.14"
+!define PRODUCT_VERSION "1.2.15"
 !define PRODUCT_PUBLISHER "Beam Interactive"
 !define PRODUCT_WEB_SITE "http://beam.pro"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tachyon64.exe"

plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -15,6 +15,8 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ******************************************************************************/
 
+//#define _FTL_USE_H264
+
 #include <obs-module.h>
 #include <util/circlebuf.h>
 #include <util/threading.h>
@@ -1337,9 +1339,11 @@ static int try_connect(struct ffmpeg_output *output)
 	}
 
 	/* Glue together the ingest URL */
+	int remote_port = ftl_get_remote_port(output->stream_config);
 
 #ifdef _WIN32
-	swprintf(ftl_ingest_arg, sizeof(ftl_ingest_arg)/sizeof(wchar_t), L"-rtpingestaddr=%hs:8082", config.ingest_ip);
+	swprintf(ftl_ingest_arg, sizeof(ftl_ingest_arg)/sizeof(wchar_t), L"-rtpingestaddr=%hs:%d", config.ingest_location, remote_port);
+
 	blog(LOG_WARNING, "FTL ingest args are: %S\n", ftl_ingest_arg);
   	ZeroMemory( &output->ShExecInfo, sizeof(output->ShExecInfo) );
 	output->ShExecInfo.cbSize = sizeof(SHELLEXECUTEINFO);
@@ -1354,7 +1358,7 @@ static int try_connect(struct ffmpeg_output *output)
 	ShellExecuteEx(&output->ShExecInfo);
 	SetPriorityClass(output->ShExecInfo.hProcess, HIGH_PRIORITY_CLASS);
 #else
-	snprintf(ftl_ingest_arg, sizeof(ftl_ingest_arg), "-rtpingestaddr=%s:8082", config.ingest_ip);
+	snprintf(ftl_ingest_arg, sizeof(ftl_ingest_arg), "-rtpingestaddr=%s:%d", config.ingest_ip, remote_port);
 	blog(LOG_WARNING, "FTL ingest args are: %s\n", ftl_ingest_arg);
 	/* print error message if fork() fails */
 	blog(LOG_WARNING, "Forking Process\n");