Skip to content

Commit 93d15cf

Browse files
committed
Update WebRTC dependency in Dockerfile
Fix webrtccapturer sample
1 parent 6e18af1 commit 93d15cf

File tree

16 files changed

+3763
-26
lines changed

16 files changed

+3763
-26
lines changed

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@ RUN sudo update-alternatives \
2323
--slave /usr/bin/g++ g++ /usr/bin/g++-6
2424

2525
# Download and extract precompiled WebRTC static libraries
26-
# COPY vendor/webrtc-17657-894c0c6-linux-x64 /vendor/webrtc-17657-894c0c6-linux-x64
27-
RUN mkdir -p /vendor/webrtc-17657-894c0c6-linux-x64; \
28-
curl -sSL https://github.com/sourcey/webrtc-precompiled-builds/raw/master/webrtc-17657-894c0c6-linux-x64.tar.gz | sudo tar -xzC /vendor/webrtc-17657-894c0c6-linux-x64
26+
# COPY vendor/webrtc-22215-ab42706-linux-x64 /vendor/webrtc-22215-ab42706-linux-x64
27+
RUN mkdir -p /vendor/webrtc-22215-ab42706-linux-x64; \
28+
curl -sSL https://github.com/sourcey/webrtc-precompiled-builds/raw/master/webrtc-22215-ab42706-linux-x64.tar.gz | sudo tar -xzC /vendor/webrtc-22215-ab42706-linux-x64
2929

3030
# Install LibSourcey
3131
RUN git clone https://github.com/sourcey/libsourcey.git && \
3232
cd /libsourcey && mkdir build && cd build && \
3333
cmake .. -DCMAKE_BUILD_TYPE=DEBUG -DBUILD_SHARED_LIBS=OFF -DBUILD_WITH_STATIC_CRT=ON \
3434
-DBUILD_MODULES=ON -DBUILD_APPLICATIONS=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF \
3535
-DWITH_FFMPEG=OFF -DWITH_WEBRTC=ON -DENABLE_LOGGING=OFF \
36-
-DWEBRTC_ROOT_DIR=/vendor/webrtc-17657-894c0c6-linux-x64 \
36+
-DWEBRTC_ROOT_DIR=/vendor/webrtc-22215-ab42706-linux-x64 \
3737
-DCMAKE_INSTALL_PREFIX=/libsourcey/install && \
3838
make VERBOSE=1 && \
3939
make install
4040
# cachebust
4141

4242
# Set the working directory to the LibSourcey install directory
43-
WORKDIR /libsourcey/install
43+
WORKDIR /libsourcey/install

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.2
1+
1.1.2

package-lock.json

Lines changed: 276 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/webrtc/include/scy/webrtc/streamrecorder.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ class StreamRecorder : public rtc::VideoSinkInterface<webrtc::VideoFrame>,
4848
av::MultiplexEncoder _encoder;
4949
rtc::scoped_refptr<webrtc::VideoTrackInterface> _videoTrack;
5050
rtc::scoped_refptr<webrtc::AudioTrackInterface> _audioTrack;
51-
bool _awaitingVideo;
52-
bool _awaitingAudio;
51+
bool _awaitingVideo = false;
52+
bool _awaitingAudio = false;
53+
bool _shouldInit = true;
5354
};
5455

5556

0 commit comments

Comments
 (0)