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.

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

GB28181: Support external SIP server. v6.0.144 #4101

Merged
merged 10 commits into from
Jul 27, 2024

Conversation

duiniuluantanqin
Copy link
Member

@duiniuluantanqin duiniuluantanqin commented Jun 21, 2024

For #3369 to support an external powerful SIP server, do not use the embedded SIP server of SRS.
For more information, detailed steps, system architecture, and background explanation, please see https://ossrs.net/lts/zh-cn/docs/v6/doc/gb28181#external-sip


Co-authored-by: Jacob Su suzp1984@gmail.com

@winlinvip winlinvip added the EnglishNative This issue is conveyed exclusively in English. label Jun 21, 2024
@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

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

@winlinvip winlinvip requested review from suzp1984 and winlinvip June 27, 2024 06:48
@@ -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?

Copy link
Member Author

Choose a reason for hiding this comment

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

In essence, the external SIP server is not part of SRS. You can look at my implementation, even use it directly, but it's not mandatory. So, I don't want to modify it for now.

@winlinvip winlinvip changed the title Add SrsGoApiGbPublish class for external SIP server mode GB28181: Support external SIP server. Jul 5, 2024
@winlinvip winlinvip changed the title GB28181: Support external SIP server. GB28181: Support external SIP server. v6.0.144 Jul 27, 2024
@winlinvip winlinvip added the RefinedByAI Refined by AI/GPT. label Jul 27, 2024
@winlinvip winlinvip merged commit 65ad907 into ossrs:develop Jul 27, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EnglishNative This issue is conveyed exclusively in English. RefinedByAI Refined by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants