From bc824f7c7910589caed5629ebcd1ac1ed9613b08 Mon Sep 17 00:00:00 2001 From: mpromonet Date: Sun, 15 Mar 2020 18:21:19 +0100 Subject: [PATCH] add some logs in github flow + try to compile appveyor with clang --- .github/workflows/ccpp.yml | 5 ++++- appveyor.yml | 2 +- config.json | 13 ++----------- html | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 59e2c4b5..3e4b8d0e 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -26,6 +26,9 @@ jobs: run: | export PATH=$(pwd)/depot_tools:$PATH cmake -DWEBRTCROOT=$(pwd)/webrtc . - cat ./webrtc/src/out/*/obj/third_party/jsoncpp/jsoncpp.ninja + g++ -v + g++ -print-file-name=libstdc++.a + nm $(g++ -print-file-name=libstdc++.a) | c++filt | grep ::basic_ostringstream + nm libwebrtcextra.a | c++filt | grep ::basic_ostringstream - name: make run: make VERBOSE=1 diff --git a/appveyor.yml b/appveyor.yml index c75393e0..e7ab968d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ before_build: - cmd: call "C:\Program Files (x86)\Microsoft Visual Studio\%APPVEYOR_BUILD_WORKER_IMAGE:~-4%\Community\VC\Auxiliary\Build\vcvars64.bat" - ps: cd $env:APPVEYOR_BUILD_FOLDER - cmd: cmake -G Ninja -D WEBRTCBUILD=%CONFIGURATION% -DWEBRTCROOT=%APPVEYOR_BUILD_FOLDER:\=/%/webrtc -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_CXX_COMPILER=clang-cl.exe . - - sh: cmake -G Ninja -D WEBRTCBUILD=${CONFIGURATION} -DWEBRTCROOT=${APPVEYOR_BUILD_FOLDER}/webrtc . + - sh: cmake -G Ninja -D WEBRTCBUILD=${CONFIGURATION} -DWEBRTCROOT=${APPVEYOR_BUILD_FOLDER}/webrtc -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ . build_script: - ninja diff --git a/config.json b/config.json index 408de090..484eaa27 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,7 @@ { "urls":{ "Bunny": {"video": "rtsp://wowzaec2demo.streamlock.net/vod/mp4:BigBuckBunny_115k.mov"}, - + "Texel": {"video": "rtsp://webcamserverdh.dyndns-remote.com:1935/live/mp4:ehtx.stream"}, "Havenmond": {"video": "rtsp://85.25.218.202:1935/live/mp4:havenmond.stream"}, @@ -9,6 +9,7 @@ "LilaDelman": {"video": "rtsp://narr-cam.liladelman.com/axis-media/media.amp"}, "VirginiaTech": {"video": "rtsp://198.82.159.136:554/axis-media/media.amp", "position":"37.223357,-80.417004"}, + "PriceCenterPlaza" : { "video": "rtsp://132.239.12.145:554/axis-media/media.amp"}, "Bahia": {"video": "rtsp://187.1.147.77:2000/axis-media/media.amp", "position": "-12.618330,-38.955830" }, "Honk-Kong": {"video": "rtsp://weathercam.gsis.edu.hk/axis-media/media.amp", "position":"22.352734,114.1277", "options":"rtptransport=tcp&timeout=60"}, @@ -29,16 +30,6 @@ "Scheveningen-1": {"video": "rtsp://b1.dnsdojo.com:1935/live/sys1.stream", "position":"52.1042263,4.2494571"}, "Scheveningen-3": {"video": "rtsp://b1.dnsdojo.com:1935/live/sys3.stream"}, - "Arrifana": {"video": "rtsp://46.105.54.176:80/64connections/arrifana.stream", "options":"rtptransport=tcp&timeout=60"}, - "CapBreton": {"video": "rtsp://46.105.54.176:80/64connections/capbreton.stream", "options":"rtptransport=tcp&timeout=60"}, - "Chamrousse": {"video": "rtsp://46.105.54.176:80/64connections/chamrousse2.stream", "options":"rtptransport=tcp&timeout=60"}, - "Hendaye": {"video": "rtsp://46.105.54.176:80/64connections/hendaye.stream", "options":"rtptransport=tcp&timeout=60"}, - "Marseille": {"video": "rtsp://46.105.54.176:80/64connections/marseille.stream", "options":"rtptransport=tcp&timeout=60"}, - "PaçoDeArcos": {"video": "rtsp://46.105.54.176:80/64connections/parcos.stream", "position":"38.701468,-9.3101928", "options":"rtptransport=tcp&timeout=60"}, - "Paris-1": {"video": "rtsp://46.105.54.176:80/64connections/Pariscam1.stream", "options":"rtptransport=tcp&timeout=60"}, - "Paris-3": {"video": "rtsp://46.105.54.176:80/64connections/Pariscam3.stream", "options":"rtptransport=tcp&timeout=60"}, - "Paris-4": {"video": "rtsp://46.105.54.176:80/64connections/Pariscam4.stream", "options":"rtptransport=tcp&timeout=60"}, - "Curacao": {"video": "rtsp://srv13.arkasis.nl:80/498/default.stream", "position":"12.2376122,-69.1801954"}, "Volendam": {"video": "rtsp://srv13.arkasis.nl:80/508/default.stream"}, "Maasstricht": {"video": "rtsp://srv13.arkasis.nl:80/639/default.stream"}, diff --git a/html b/html index 804aac32..baf89726 160000 --- a/html +++ b/html @@ -1 +1 @@ -Subproject commit 804aac32472eed777aa9e3c6dc736fc89d2d008b +Subproject commit baf89726bdb3939b63bc062d0edd9d45feaeea44