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

Add SrsGoApiGbPublish class for external SIP server mode #4101

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Add SrsGoApiGbPublish class for external SIP server mode #4101

wants to merge 2 commits into from

Conversation

duiniuluantanqin
Copy link
Member

@duiniuluantanqin duiniuluantanqin commented Jun 21, 2024 •
edited
Loading

for #3369

You can test it using https://github.com/ossrs/srs-sip

  1. Start SRS and SRS-SIP
./objs/srs -c conf/gb28181.conf

./bin/srs-sip -sip-port 5060 -media-addr 127.0.0.1:1985
  1. Please refer to the link for the camera configuration: https://ossrs.net/lts/zh-cn/docs/v5/doc/gb28181#usage
  2. SRS-SIP comes with a simple web-based player, as shown below.
    image
  3. You can click on '获取设备' and then click on the channel to play.

@winlinvip winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Jun 21, 2024
@duiniuluantanqin duiniuluantanqin mentioned this pull request Jun 21, 2024
Closed
@suzp1984
Copy link
Contributor

https://ossrs.net/lts/zh-cn/docs/v5/doc/gb28181#usage
the doc need to updated, as I found, gb28181-2022 also supported by srs. GB28181-2022 is also the only option in my camera.

@duiniuluantanqin
Copy link
Member Author

duiniuluantanqin commented Jun 24, 2024 •
edited
Loading

https://ossrs.net/lts/zh-cn/docs/v5/doc/gb28181#usage the doc need to updated, as I found, gb28181-2022 also supported by srs. GB28181-2022 is also the only option in my camera.

Yeah, this is the work I am currently doing, and I will submit the changes as soon as possible.

Update: ossrs/srs-docs#67

suzp1984
suzp1984 reviewed Jun 27, 2024
View reviewed changes
trunk/src/app/srs_app_gb28181.cpp
@@ -421,12 +425,12 @@ srs_error_t SrsGbListener::initialize(SrsConfDirective* conf)

bool sip_enabled = _srs_config->get_stream_caster_sip_enable(conf);
if (!sip_enabled) {
return srs_error_new(ERROR_GB_CONFIG, "GB SIP is required");
srs_warn("GB SIP is disabled.");
Copy link
Contributor

Choose a reason for hiding this comment

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

one more thing to review. About the conf directives of sip.enable:

srs/trunk/conf/full.conf

Lines 681 to 683 in ea7e2c2

# Whether enable embedded SIP server.
# Default: on
enabled on;

The code here means: GB internal SIP is disabled, so don't break the GB process, SRS can still support the external SIP.

So, there are a few thing to consider:

  1. improve the log: GB [internal|embedded] SIP is disabled;
  2. Internal SIP is no longer a necessary one, so use srs_trace to replace srs_warn;
  3. Maybe rename sip_enable to internal_sip_enabled;
  4. External sip is the future, so no need to enable or disable it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@suzp1984 suzp1984 suzp1984 left review comments

@winlinvip winlinvip Awaiting requested review from winlinvip

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
EnglishNative This issue is conveyed exclusively in English.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@duiniuluantanqin @suzp1984 @winlinvip