mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
GB28181: 无法对接平台问题及一些小bug (#2109)
* 1-新增srs_string_split2函数,该函数支持空串也能按照原有顺序进行切分并放入数组 2-SrsGb28181Device增加属性字段,并在收到catalog命令时能够更新该属性 3-修复sip包解包不严谨bug(body中有可能会有SRS_RTSP_CRLFCRLF那么导致header_body[1]就不一定是body了可能只是body的一部分) * 1-修复停用rtp多路复用参数(invite_port_fixed)不起作用bug * bugfix: 当srs发送invite时会指定一个ssrc作为流媒体序列号,但有些平台发流时并不使用这个作为ssrc,而是自己新生成一个。(修复该bug是在invite response时解析内容中的sdp,把对方生成的流媒体序列号ssrc读出来,并且更新srs的channel映射) * Update push.gb28181.conf 恢复成原来的conf * bugfix,在取得muxer时需要更新。之前写反了 * Merge branch 'develop' into 4.0release * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 修改sdp_map相同属性的连接符 * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 修改sdp_map相同属性的连接符 * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 解决冲突时,优先选择原有代码(还原选择develop的代码) * 回退原来代码 * 删除parse_sdp存储至map相关代码 * 格式恢复 * 格式恢复 * 恢复格式 * srs_string_split() 函数的bugfix Co-authored-by: xbpeng <xianbin.peng@sibat.cn>
This commit is contained in:
parent
6cf93557e1
commit
47422b7819
5 changed files with 45 additions and 62 deletions
|
@ -108,6 +108,7 @@ class SrsGb28181Conn;
|
|||
class SrsGb28181Caster;
|
||||
|
||||
//ps rtp header packet parse
|
||||
|
||||
class SrsPsRtpPacket: public SrsRtpPacket
|
||||
{
|
||||
public:
|
||||
|
@ -160,7 +161,7 @@ private:
|
|||
SrsPithyPrint* pprint;
|
||||
SrsGb28181Config* config;
|
||||
std::map<std::string, SrsPsRtpPacket*> cache_ps_rtp_packet;
|
||||
std::map<std::string, SrsPsRtpPacket*> pre_packet;
|
||||
std::map<std::string, SrsPsRtpPacket*> pre_packet;
|
||||
std::string channel_id;
|
||||
bool auto_create_channel;
|
||||
public:
|
||||
|
@ -170,7 +171,7 @@ private:
|
|||
bool can_send_ps_av_packet();
|
||||
void dispose();
|
||||
void clear_pre_packet();
|
||||
SrsGb28181RtmpMuxer* create_rtmpmuxer(std::string channel_id, uint32_t ssrc);
|
||||
SrsGb28181RtmpMuxer* fetch_rtmpmuxer(std::string channel_id, uint32_t ssrc);
|
||||
srs_error_t rtmpmuxer_enqueue_data(SrsGb28181RtmpMuxer *muxer, uint32_t ssrc,
|
||||
int peer_port, std::string address_string, SrsPsRtpPacket *pkt);
|
||||
// Interface ISrsUdpHandler
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue