-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
For #1653, #1500, Support GB28181, another solution. #1656
Conversation
update to latest
trunk/src/app/srs_app_gb28181.cpp
Outdated
char *payload = cache_payload[cur_timestamp]->bytes(); | ||
int payload_len = cache_payload[cur_timestamp]->length(); | ||
|
||
on_ps_stream(payload, payload_len, cur_timestamp); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should check for errors.
TRANS_BY_GPT3
trunk/src/app/srs_app_gb28181.cpp
Outdated
|
||
if (audio_enable && audio_stream.length() && can_send_ps_av_packet()) { | ||
if ((err = gb28181->on_rtp_audio(&audio_stream, audio_pts)) != srs_success) { | ||
srs_trace("process ps audio packet error %s", err); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
%s err may have exceptions. The err object needs to be released.
TRANS_BY_GPT3
trunk/src/app/srs_app_gb28181.cpp
Outdated
session_id.c_str(), ps_size, complete_len); | ||
}else if (video_stream.length() && can_send_ps_av_packet()) { | ||
if ((err = gb28181->on_rtp_video(&video_stream, video_pts, keyframe)) != srs_success) { | ||
srs_trace("process ps video packet error"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The error message is stored in 'err' and not printed in the log.
TRANS_BY_GPT3
trunk/src/app/srs_app_gb28181.cpp
Outdated
} | ||
srs_assert(conn != NULL); | ||
|
||
// if (conn->register_status == Srs28181Unkonw) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove useless code directly.
TRANS_BY_GPT3
修复srs_write_large_iovs中nwrite未累加的错误
trunk/src/protocol/srs_sip_stack.cpp
Outdated
<< "a=rtpmap:97 MPEG4/90000" << SRS_RTSP_CRLF | ||
<< "a=rtpmap:98 H264/90000" << SRS_RTSP_CRLF | ||
<< "a=rtpmap:99 H265/90000" << SRS_RTSP_CRLF |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are there plans to support these streams in SrsPsRtpConn
if they have not been handled yet? If there are no plans to support them, it is recommended to remove this part.
TRANS_BY_GPT3
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently only supports PS. The new submission has already been annotated. Thank you for the suggestion.
TRANS_BY_GPT3
Codecov Report
@@ Coverage Diff @@
## develop #1656 +/- ##
========================================
Coverage 65.72% 65.72%
========================================
Files 102 102
Lines 42586 42586
========================================
Hits 27989 27989
Misses 14597 14597 Continue to review full report at Codecov.
Translated to English:
|
For #1653 and #1500