external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-06-06 21:54:54 +08:00
commit 57f01185f5
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
trunk/src/app/srs_app_source.cpp
View file

@ -54,6 +54,9 @@ using namespace std;
// 115 packets is 3s.
#define SRS_PURE_AUDIO_GUESS_COUNT 115
// when got these videos or audios, mix ok.
#define SRS_MIX_CORRECT_MIX_AV 10
int _srs_time_jitter_string2int(std::string time_jitter)
{
if (time_jitter == "full") {
@ -810,6 +813,7 @@ void SrsSource::destroy()
SrsMixQueue::SrsMixQueue()
{
nb_videos = 0;
nb_audios = 0;
}
SrsMixQueue::~SrsMixQueue()
@ -827,6 +831,7 @@ void SrsMixQueue::clear()
msgs.clear();
nb_videos = 0;
nb_audios = 0;
}
void SrsMixQueue::push(SrsSharedPtrMessage* msg)
@ -835,15 +840,20 @@ void SrsMixQueue::push(SrsSharedPtrMessage* msg)
if (msg->is_video()) {
nb_videos++;
} else {
nb_audios++;
}
}
SrsSharedPtrMessage* SrsMixQueue::pop()
{
// always keep 2+ videos
if (nb_videos < 2) {
// when got 10+ videos or audios, mix ok.
// when got 1 video and 1 audio, mix ok.
if (nb_videos < SRS_MIX_CORRECT_MIX_AV && nb_audios < SRS_MIX_CORRECT_MIX_AV) {
if (nb_videos < 1 || nb_audios < 1) {
return NULL;
}
}
// pop the first msg.
std::multimap<int64_t, SrsSharedPtrMessage*>::iterator it = msgs.begin();
@ -852,6 +862,8 @@ SrsSharedPtrMessage* SrsMixQueue::pop()
if (msg->is_video()) {
nb_videos--;
} else {
nb_audios--;
}
return msg;

1
trunk/src/app/srs_app_source.hpp
View file

@ -375,6 +375,7 @@ class SrsMixQueue
{
private:
u_int32_t nb_videos;
u_int32_t nb_audios;
std::multimap<int64_t, SrsSharedPtrMessage*> msgs;
public:
SrsMixQueue();