external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

For #307, rtc support osx

Browse source
This commit is contained in:
winlin 2020-03-28 20:52:42 +08:00
parent 04c3370458
commit dae7af8444
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/3rdparty/ffmpeg-4.2-fit/libavutil/avconfig.h vendored
View file

@ -1,6 +0,0 @@
/* Generated by ffmpeg configure */
#ifndef AVUTIL_AVCONFIG_H
#define AVUTIL_AVCONFIG_H
#define AV_HAVE_BIGENDIAN 0
#define AV_HAVE_FAST_UNALIGNED 0
#endif /* AVUTIL_AVCONFIG_H */

2
trunk/auto/depends.sh
View file

@ -365,7 +365,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
echo "Building srtp2."; echo "Building srtp2.";
( (
rm -rf ${SRS_OBJS}/srtp2 && cd ${SRS_OBJS} && rm -rf ${SRS_OBJS}/srtp2 && cd ${SRS_OBJS} &&
unzip -q ../3rdparty/libsrtp-2.0.0.zip && cd libsrtp-2.0.0 && rm -rf libsrtp-2.0.0 && unzip -q ../3rdparty/libsrtp-2.0.0.zip && cd libsrtp-2.0.0 &&
./configure --prefix=`pwd`/_release && make ${SRS_JOBS} && make install && ./configure --prefix=`pwd`/_release && make ${SRS_JOBS} && make install &&
cd .. && rm -f srtp2 && ln -sf libsrtp-2.0.0/_release srtp2 cd .. && rm -f srtp2 && ln -sf libsrtp-2.0.0/_release srtp2
) )

5
trunk/configure vendored
View file

@ -684,6 +684,11 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
else else
echo -e "${GREEN}Warning: SRT is disabled.${BLACK}" echo -e "${GREEN}Warning: SRT is disabled.${BLACK}"
fi fi
if [ $SRS_RTC = YES ]; then
echo -e "${YELLOW}Experiment: RTC is enabled. https://github.com/ossrs/srs/issues/307${BLACK}"
else
echo -e "${GREEN}Warning: RTC is disabled.${BLACK}"
fi
if [ $SRS_DVR = YES ]; then if [ $SRS_DVR = YES ]; then
echo -e "${GREEN}DVR is enabled.${BLACK}" echo -e "${GREEN}DVR is enabled.${BLACK}"
else else

7
trunk/src/app/srs_app_rtc_conn.cpp
View file

@ -810,6 +810,13 @@ srs_error_t SrsRtcSession::check_source()
return err; return err;
} }
#ifdef SRS_AUTO_OSX
// These functions are similar to the older byteorder(3) family of functions.
// For example, be32toh() is identical to ntohl().
// @see https://linux.die.net/man/3/be32toh
#define be32toh ntohl
#endif
srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* udp_mux_skt, SrsStunPacket* stun_req) srs_error_t SrsRtcSession::on_binding_request(SrsUdpMuxSocket* udp_mux_skt, SrsStunPacket* stun_req)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;