Skip to content
Snippets Groups Projects
Commit e088933f authored by Simon Oehrl's avatar Simon Oehrl
Browse files

Merge branch 'master' of devhub.vr.rwth-aachen.de:VR-Group/webstreamer

parents ac61d612 9a0c883b
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 24658 additions and 111 deletions
client/.gitignore
+ 0
− 1
View file @ e088933f
node_modules
.vscode
npm-debug.log
dist
\ No newline at end of file
client/dist/002ff65de7143238eb8696448cfc049e.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/002ff65de7143238eb8696448cfc049e.png

207 B

client/dist/117c2a963c1ac9faf0562caeef52ca7b.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/117c2a963c1ac9faf0562caeef52ca7b.png

280 B

client/dist/18fbb5e53600e6deea5870799c7319a4.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/18fbb5e53600e6deea5870799c7319a4.png

4.44 KiB

client/dist/3861e9eb08528ed839cf22c3d51e2042.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/3861e9eb08528ed839cf22c3d51e2042.png

6.76 KiB

client/dist/4b1a6e113e7ce826f0f7b74a42dfdf86.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/4b1a6e113e7ce826f0f7b74a42dfdf86.png

262 B

client/dist/5b2c08ae1ffe76987b1ceb831c982c44.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/5b2c08ae1ffe76987b1ceb831c982c44.png

6.83 KiB

client/dist/6e8da81c268f3800fc0e1f4264551079.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/6e8da81c268f3800fc0e1f4264551079.png

4.44 KiB

client/dist/760296d3d5ec6779a8cc3aa863c05b15.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/760296d3d5ec6779a8cc3aa863c05b15.png

262 B

client/dist/8048f365d4c09c3a904679a60a6cc7fc.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/8048f365d4c09c3a904679a60a6cc7fc.png

335 B

client/dist/94c724823374be623fd19618399116e5.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/94c724823374be623fd19618399116e5.png

6.83 KiB

client/dist/bd5e0f59071855c32c2fcc1115571e07.png 0 → 100644
+ 0
− 0
View file @ e088933f
client/dist/bd5e0f59071855c32c2fcc1115571e07.png

332 B

client/dist/index.html 0 → 100644
+ 90
− 0
View file @ e088933f
<!doctype html>
<html>
<head>
<meta charset="UTF-8">
</head>
<body>
<div id="container">
<div id="webstream">
<div id="advanced-settings-overlay">
<div id="advanced-settings-overlay-tabs">
<ul>
<li>
<a href="#advanced-settings-stream">Stream</a>
</li>
<li>
<a href="#advanced-settings-codec">Codec</a>
</li>
</ul>
<div id="advanced-settings-stream">
<label for="stream">Streaming Protocol</label>
<select name="stream" id="stream">
<option selected="selected">WebSocket</option>
<option disabled="disabled">WebRTC</option>
</select>
<div class="stream-settings" data-stream-type="webSocket">
<h1>WebSocket</h1>
</div>
<div class="stream-settings" data-stream-type="webRTC">
<h1>WebRTC</h1>
</div>
</div>
<div id="advanced-settings-codec">
<label for="video-codec">Video Codec</label>
<select name="video-codec" id="video-codec">
<option selected="selected">Raw 24-bit RGB</option>
<option disabled="disabled">H.264</option>
</select>
<div class="decoder-settings" data-codec="raw">
<h1>Raw</h1>
</div>
<div class="decoder-settings" data-codec="h264">
<h1>H264</h1>
</div>
</div>
</div>
</div>
<ul id="settings-menu" class="settings-menu">
<li id="advanced">
<div>Advanced</div>
</li>
<li>
<div>
Show Statistics
</div>
</li>
<li id="change-quality">
<div>
Quality (
<span id="current-video-mode"></span>
)
</div>
</li>
</ul>
<ul id="quality-settings-menu" class="settings-menu">
</ul>
</div>
<div id="input-bar">
<button id="play-stop-button" style="float: left;">
<span id="play-icon" class="ui-icon ui-icon-play" style="display: none;"></span>
<span id="stop-icon" class="ui-icon ui-icon-stop"></span>
</button>
<label for="input-button">
<span class="ui-icon ui-icon-pencil"></span>
</label>
<input type="checkbox" name="input-button" id="input-button">
<button id="settings-menu-button" style="float: right;">
<span class="ui-icon ui-icon-gear"></span>
</button>
<div style="clear: both" />
</div>
</div>
<script type="text/javascript" src="webstreamer.js"></script></body>
</html>
\ No newline at end of file
client/dist/webstreamer.js 0 → 100644
+ 24566
− 0
View file @ e088933f
This diff is collapsed.
client/dist/webstreamer.js.map 0 → 100644
+ 1
− 0
View file @ e088933f
This diff is collapsed.
cmake/ConanHelpers.cmake deleted 100644 → 0
+ 0
− 110
View file @ ac61d612
#-------------------------------------------------------------------------------
# web streamer
#
# Copyright (c) 2017 RWTH Aachen University, Germany,
# Virtual Reality & Immersive Visualization Group.
#-------------------------------------------------------------------------------
# License
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#-------------------------------------------------------------------------------
#download/build the missing dependencies
include(conan)
execute_process(COMMAND conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan False OUTPUT_QUIET)
conan_cmake_run(CONANFILE conanfile.py
BUILD missing)
find_file(CONAN_COMMAND
NAMES conan conan.exe
PATHS ENV PATH ENV CONAN_DIR
)
if(CONAN_COMMAND)
option(USE_CONAN "Use conan for dependency managment." ON)
else()
message(STATUS
" NOTICE:\n"
" This project can use conan for dependency management.\n"
" Apparently, you do not have conan installed on your machine.\n"
" So you need to keep track of all dependencies.\n"
" In order to use conan, please install it:\n"
" pip install conan\n"
" More info: https://conan.io"
)
endif()
#we reset CONAN_BUILD_INFO, so it is searched everytime, e.g. if we want to change from multi to a specific config
set (CONAN_BUILD_INFO "CONAN_BUILD_INFO-NOTFOUND")
find_file(CONAN_BUILD_INFO conanbuildinfo_multi.cmake
NO_DEFAULT_PATH
PATHS ${CMAKE_BINARY_DIR}
)
if(${CONAN_BUILD_INFO} STREQUAL "CONAN_BUILD_INFO-NOTFOUND")
find_file(CONAN_BUILD_INFO conanbuildinfo.cmake
NO_DEFAULT_PATH
PATHS ${CMAKE_BINARY_DIR}
)
if(NOT ${CONAN_BUILD_INFO} STREQUAL "CONAN_BUILD_INFO-NOTFOUND")
set( USE_NOT_MULTI_CONAN_BUILD_INFO TRUE)
endif()
endif()
if(USE_CONAN AND NOT CONAN_BUILD_INFO)
message(FATAL_ERROR
" Error using conan:\n"
" You need to execute 'conan install' before running cmake!\n"
" Aborting.")
endif()
if(USE_CONAN AND CONAN_BUILD_INFO)
include(${CONAN_BUILD_INFO})
if(USE_NOT_MULTI_CONAN_BUILD_INFO)
conan_basic_setup(TARGETS NO_OUTPUT_DIRS)
else()
conan_basic_setup(TARGETS)
endif()
endif()
macro(CONAN_OR_FIND_PACKAGE package)
# parse arguments
set(options)
set(oneValueArgs CONAN_NAME)
set(multiValueArgs)
cmake_parse_arguments(CONAN_OR_FIND_PACKAGE
"${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
string(REPLACE ";" " " ADDITIONAL_PARAMS "${CONAN_OR_FIND_PACKAGE_UNPARSED_ARGUMENTS}")
# set default conan target name if CONAN_NAME was not specified
if(CONAN_OR_FIND_PACKAGE_CONAN_NAME)
set(CONAN_PACKAGE_NAME CONAN_PKG::${CONAN_OR_FIND_PACKAGE_CONAN_NAME})
else()
set(CONAN_PACKAGE_NAME CONAN_PKG::${package})
endif()
# set target variable to be used in target_link_libraries accordingly
option(USE_CONAN_${package} "Use conan for dependency ${package}" ${USE_CONAN})
string(REPLACE "." "_"
package_underscored
${package}
)
if(USE_CONAN AND USE_CONAN_${package})
set(CONAN_OR_CMAKE_${package_underscored} ${CONAN_PACKAGE_NAME})
else()
find_package(${package} ${ADDITIONAL_PARAMS})
set(CONAN_OR_CMAKE_${package_underscored} ${package})
endif()
endmacro()
webstreamer/src/keyboard_event.cpp
+ 1
− 0
View file @ e088933f
......@@ -22,6 +22,7 @@
#include "webstreamer/keyboard_event.hpp"
#include <cassert>
#include <cstring>
#include <stdexcept>
namespace webstreamer {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment