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

Merge remote-tracking branch 'srs/feature/codec' into feature/rtc_audio

Browse source
This commit is contained in:
bepartofyou 2020-03-22 20:16:24 +08:00
commit 923209b070
16 changed files with 136 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

26
trunk/src/app/srs_app_listener.cpp
View file

@ -237,23 +237,21 @@ SrsUdpMuxSocket::~SrsUdpMuxSocket()
srs_freepa(buf);
}
SrsUdpMuxSocket::SrsUdpMuxSocket(const SrsUdpMuxSocket& rhs)
SrsUdpMuxSocket* SrsUdpMuxSocket::copy_sendonly()
{
operator=(rhs);
}
SrsUdpMuxSocket* sendonly = new SrsUdpMuxSocket(lfd);
SrsUdpMuxSocket& SrsUdpMuxSocket::operator=(const SrsUdpMuxSocket& rhs)
{
buf = NULL;
nb_buf = 0;
nread = 0;
lfd = rhs.lfd;
from = rhs.from;
fromlen = rhs.fromlen;
peer_ip = rhs.peer_ip;
peer_port = rhs.peer_port;
// Don't copy buffer
srs_freepa(sendonly->buf);
sendonly->nb_buf = 0;
sendonly->nread = 0;
sendonly->lfd = lfd;
sendonly->from = from;
sendonly->fromlen = fromlen;
sendonly->peer_ip = peer_ip;
sendonly->peer_port = peer_port;
return *this;
return sendonly;
}
int SrsUdpMuxSocket::recvfrom(srs_utime_t timeout)

9
trunk/src/app/srs_app_listener.hpp
View file

@ -143,9 +143,6 @@ public:
SrsUdpMuxSocket(srs_netfd_t fd);
virtual ~SrsUdpMuxSocket();
SrsUdpMuxSocket(const SrsUdpMuxSocket& rhs);
SrsUdpMuxSocket& operator=(const SrsUdpMuxSocket& rhs);
int recvfrom(srs_utime_t timeout);
srs_error_t sendto(void* data, int size, srs_utime_t timeout);
@ -154,6 +151,12 @@ public:
std::string get_peer_ip() const { return peer_ip; }
int get_peer_port() const { return peer_port; }
std::string get_peer_id();
public:
SrsUdpMuxSocket* copy_sendonly();
private:
// Don't allow copy, user copy_sendonly instead
SrsUdpMuxSocket(const SrsUdpMuxSocket& rhs);
SrsUdpMuxSocket& operator=(const SrsUdpMuxSocket& rhs);
};
class SrsUdpMuxListener : public ISrsCoroutineHandler

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

@ -605,18 +605,19 @@ srs_error_t SrsDtlsSession::unprotect_rtcp(char* out_buf, const char* in_buf, in
}
SrsRtcSenderThread::SrsRtcSenderThread(SrsRtcSession* s, SrsUdpMuxSocket* u, int parent_cid)
: ukt(NULL)
: sendonly_ukt(NULL)
{
_parent_cid = parent_cid;
trd = new SrsDummyCoroutine();
rtc_session = s;
ukt = *u;
sendonly_ukt = u->copy_sendonly();
}
SrsRtcSenderThread::~SrsRtcSenderThread()
{
srs_freep(trd);
srs_freep(sendonly_ukt);
}
int SrsRtcSenderThread::cid()
@ -695,10 +696,19 @@ srs_error_t SrsRtcSenderThread::cycle()
continue;
}
send_and_free_messages(msgs.msgs, msg_count, &ukt);
send_and_free_messages(msgs.msgs, msg_count, sendonly_ukt);
}
}
void SrsRtcSenderThread::update_sendonly_socket(SrsUdpMuxSocket* ukt)
{
srs_trace("session %s address changed, update %s -> %s",
rtc_session->id().c_str(), sendonly_ukt->get_peer_id().c_str(), ukt->get_peer_id().c_str());
srs_freep(sendonly_ukt);
sendonly_ukt = ukt->copy_sendonly();
}
void SrsRtcSenderThread::send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, SrsUdpMuxSocket* udp_mux_skt)
{
srs_error_t err = srs_success;
@ -776,6 +786,12 @@ srs_error_t SrsRtcSession::on_stun(SrsUdpMuxSocket* udp_mux_skt, SrsStunPacket*
last_stun_time = srs_get_system_time();
if (strd && strd->sendonly_ukt) {
if (strd->sendonly_ukt->get_peer_id() != udp_mux_skt->get_peer_id()) {
strd->update_sendonly_socket(udp_mux_skt);
}
}
return err;
}

5
trunk/src/app/srs_app_rtc_conn.hpp
View file

@ -165,7 +165,8 @@ protected:
int _parent_cid;
private:
SrsRtcSession* rtc_session;
SrsUdpMuxSocket ukt;
public:
SrsUdpMuxSocket* sendonly_ukt;
public:
SrsRtcSenderThread(SrsRtcSession* s, SrsUdpMuxSocket* u, int parent_cid);
virtual ~SrsRtcSenderThread();
@ -177,6 +178,8 @@ public:
virtual void stop_loop();
public:
virtual srs_error_t cycle();
public:
void update_sendonly_socket(SrsUdpMuxSocket* ukt);
private:
void send_and_free_messages(SrsSharedPtrMessage** msgs, int nb_msgs, SrsUdpMuxSocket* udp_mux_skt);
};

5
trunk/src/core/srs_core.hpp
View file

@ -62,6 +62,11 @@
#define __STDC_FORMAT_MACROS
#endif
// For RTC/FFMPEG build.
#if defined(SRS_AUTO_RTC) && !defined(__STDC_CONSTANT_MACROS)
#define __STDC_CONSTANT_MACROS
#endif
// For srs-librtmp, @see https://github.com/ossrs/srs/issues/213
#ifndef _WIN32
#include <inttypes.h>

2
trunk/src/core/srs_core_version4.hpp
View file

@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION4_HPP
#define SRS_CORE_VERSION4_HPP
#define SRS_VERSION4_REVISION 13
#define SRS_VERSION4_REVISION 14
#endif

19
trunk/src/kernel/srs_kernel_utility.cpp
View file

@ -652,15 +652,20 @@ bool srs_path_exists(std::string path)
string srs_path_dirname(string path)
{
std::string dirname = path;
// No slash, it must be current dir.
size_t pos = string::npos;
if ((pos = dirname.rfind("/")) != string::npos) {
if (pos == 0) {
return "/";
}
dirname = dirname.substr(0, pos);
if ((pos = dirname.rfind("/")) == string::npos) {
return "./";
}
// Path under root.
if (pos == 0) {
return "/";
}
// Fetch the directory.
dirname = dirname.substr(0, pos);
return dirname;
}

4
trunk/src/main/srs_main_server.cpp
View file

@ -337,8 +337,8 @@ void show_macro_features()
#endif
#if VERSION_MAJOR > VERSION_STABLE
#warning "Current branch is unstable."
srs_warn("Develop is unstable, please use branch: git checkout -b %s origin/%s", VERSION_STABLE_BRANCH, VERSION_STABLE_BRANCH);
#warning "Current branch is beta."
srs_warn("%s/%s is beta", RTMP_SIG_SRS_KEY, RTMP_SIG_SRS_VERSION);
#endif
#if defined(SRS_PERF_SO_SNDBUF_SIZE) && !defined(SRS_PERF_MW_SO_SNDBUF)

2
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -2565,7 +2565,7 @@ VOID TEST(KernelUtility, BytesUtils)
VOID TEST(KernelUtility, PathUtils)
{
if (true) {
EXPECT_TRUE("" == srs_path_dirname(""));
EXPECT_TRUE("./" == srs_path_dirname(""));
EXPECT_TRUE("/" == srs_path_dirname("/"));
EXPECT_TRUE("/" == srs_path_dirname("//"));
EXPECT_TRUE("/" == srs_path_dirname("/stream"));