Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix - Fix the issue of unable to connect with the platform using --with-gb28181 and some minor bugs #2109

Merged
merged 23 commits into from
Jan 6, 2021
Merged

bugfix - Fix the issue of unable to connect with the platform using --with-gb28181 and some minor bugs #2109

merged 23 commits into from
Jan 6, 2021

Conversation

xbpeng121
Copy link
Contributor

@xbpeng121 xbpeng121 commented Dec 24, 2020 •
edited by winlinvip
Loading

bugfix - Fix the issue of unable to connect with the platform using --with-gb28181 and some minor bugs

TRANS_BY_GPT3

xbpeng added 4 commits December 17, 2020 15:37
1-新增srs_string_split2函数，该函数支持空串也能按照原有顺序进行切分并放入数组
88769fb 
2-SrsGb28181Device增加属性字段，并在收到catalog命令时能够更新该属性
3-修复sip包解包不严谨bug(body中有可能会有SRS_RTSP_CRLFCRLF那么导致header_body[1]就不一定是body了可能只是body的一部分)
Merge remote-tracking branch 'my_origin/4.0release' of https://github…
a8fbedf 
….com/xbpeng121/srs into 4.0release
1-修复停用rtp多路复用参数（invite_port_fixed）不起作用bug
5d8b275
bugfix: 当srs发送invite时会指定一个ssrc作为流媒体序列号，但有些平台发流时并不使用这个作为ssrc,而是自己新生成一个…
2211767 
…。（修复该bug是在invite response时解析内容中的sdp，把对方生成的流媒体序列号ssrc读出来，并且更新srs的channel映射）
@PieerePi

This comment has been minimized.

Sign in to view
@PieerePi

This comment has been minimized.

Sign in to view
xbpeng121
xbpeng121 commented Dec 24, 2020
View reviewed changes
Copy link
Contributor Author

@xbpeng121 xbpeng121 left a comment •
edited by winlinvip
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bugfix - Fix the issue of unable to connect with the platform for srs --with-gb28181 and some minor bugs.

The issue of unable to connect with the platform has been resolved in the develop branch. Please refer to PR #2014 for more details.

Thanks, I didn't see the PR you submitted earlier, but the issues I modified are basically similar to what you modified.

TRANS_BY_GPT3

@xbpeng121
Update push.gb28181.conf
4afed82 
恢复成原来的conf
@PieerePi

This comment has been minimized.

Sign in to view
@ossrs ossrs deleted a comment from codecov-io Jan 2, 2021
@winlinvip winlinvip changed the base branch from 4.0release to develop January 3, 2021 12:10
@codecov-io

This comment has been minimized.

Sign in to view
PieerePi
PieerePi reviewed Jan 4, 2021
View reviewed changes
trunk/src/app/srs_app_gb28181.cpp Show resolved Hide resolved
trunk/src/app/srs_app_gb28181.cpp Outdated Show resolved Hide resolved
trunk/src/app/srs_app_gb28181_sip.cpp Outdated Show resolved Hide resolved
trunk/src/protocol/srs_sip_stack.cpp Outdated Show resolved Hide resolved
trunk/src/app/srs_app_gb28181_sip.cpp Outdated Show resolved Hide resolved
@xbpeng121
Copy link
Contributor Author

xbpeng121 commented Jan 5, 2021 •
edited by winlinvip
Loading

@PieerePi I have made changes to the relevant content, please take some time to review and see if there are any areas that still need improvement. Make sure to maintain the markdown structure.
ThankYou :-)

TRANS_BY_GPT3

@xbpeng121
Copy link
Contributor Author

xbpeng121 commented Jan 5, 2021 •
edited by winlinvip
Loading

all done, you can merge now

TRANS_BY_GPT3

@winlinvip
Copy link
Member

winlinvip commented Jan 6, 2021 •
edited
Loading

all done, ready to merge

@PieerePi Please confirm if there are no issues.

TRANS_BY_GPT3

@PieerePi
Copy link
Contributor

PieerePi commented Jan 6, 2021 •
edited by winlinvip
Loading

all done, ready to merge

@PieerePi Please confirm if there are no issues.

After reviewing the code again, I found that there are still some issues with srs_string_split.

I haven't used or tested the three scenarios in GB28181: auto_create_channel set to on, auto_play set to on, and invite_port_fixed set to off. Xbppeng121 has done some code merging and setting completion, and upon reviewing, it seems fine to me. However, we should test it after merging.

@xbpeng121, please modify the commit message.

TRANS_BY_GPT3

@winlinvip
Copy link
Member

winlinvip commented Jan 6, 2021 •
edited
Loading

all done, ready to merge

@PieerePi Please confirm if there are no issues.

I reviewed the code again, and there are still some issues with srs_string_split.

I haven't used or tested the three scenarios in GB28181 where auto_create_channel is set to "on", auto_play is set to "on", and invite_port_fixed is set to "off". xbppeng121 has done some code merging and setting completion, and I have only reviewed it and it looks fine. We need to test it after merging.

@xbpeng121, please modify the commit message.

@PieerePi

srs_string_split, let's put it aside for now. I will supplement it with UTest and then we can review it together.
If there are no other issues, I will merge it first.

Additionally, please add my WeChat ID. You can find the QR code on the official website: https://ossrs.net

TRANS_BY_GPT3

@xbpeng121
Copy link
Contributor Author

xbpeng121 commented Jan 6, 2021 •
edited by winlinvip
Loading

change log
1- Fix the bug in srs_string_split():
Before fix: srs_string_split("1,A,,address", ",") = ["1", "A", "address", ""]
After fix: srs_string_split2("1,A,,address", ",") = ["1", "A", "", "address"]
2- Remove duplicate code in on_rtp_packet() in srs_app_gb28181.cpp and replace it with the fetch_rtmpmuxer() function.
3- Rename the create_rtmpmuxer() function to fetch_rtmpmuxer() because if the muxer already exists in the function, it will be fetched instead of creating a new one.
4- Change a specific srs_trace output to srs_info because in the actual integration platform, this output is very frequent and affects the information viewing.
5- Fix the bug where the sip_invite_port_fixed parameter does not take effect.

@PieerePi @winlinvip

TRANS_BY_GPT3

@PieerePi
Copy link
Contributor

PieerePi commented Jan 6, 2021 •
edited by winlinvip
Loading

Okay, I don't see any problem.

TRANS_BY_GPT3

@winlinvip winlinvip merged commit 47422b7 into ossrs:develop Jan 6, 2021
@winlinvip
Copy link
Member

Merged as 47422b7

winlinvip added a commit that referenced this pull request Jan 7, 2021
@winlinvip
For #2109, Add more utest for srs_string_split
248085e
winlinvip added a commit that referenced this pull request Jan 7, 2021
@winlinvip
For #2128, #2109, Update authors.
50efd80
winlinvip added a commit that referenced this pull request Jan 8, 2021
@winlinvip
Release 4.0.58
26dec1b 
Merge #2109, Fix bugs for GB28181.
Merge #2109, Refine srs_string_split.
Fix memory leak and bugs for RTC.
@winlinvip winlinvip changed the title bugfix-修复srs --with-gb28181无法对接平台问题及一些小bug bugfix - Fix the issue of unable to connect with the platform using --with-gb28181 and some minor bugs Jul 29, 2023
@winlinvip winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PieerePi PieerePi PieerePi left review comments

@winlinvip winlinvip winlinvip left review comments

Assignees
No one assigned
Labels
TransByAI Translated by AI/GPT.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@xbpeng121 @PieerePi @codecov-io @winlinvip