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

For #1653, #1500, Support GB28181, another solution. #1656

Merged
merged 37 commits into from
Mar 31, 2020
Merged

Conversation

winlinvip
Copy link
Member

For #1653 and #1500

@winlinvip winlinvip mentioned this pull request Mar 20, 2020
char *payload = cache_payload[cur_timestamp]->bytes();
int payload_len = cache_payload[cur_timestamp]->length();

on_ps_stream(payload, payload_len, cur_timestamp);
Copy link
Member Author

@winlinvip winlinvip Mar 20, 2020

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


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);
Copy link
Member Author

@winlinvip winlinvip Mar 20, 2020

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

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");
Copy link
Member Author

@winlinvip winlinvip Mar 20, 2020

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

}
srs_assert(conn != NULL);

// if (conn->register_status == Srs28181Unkonw)
Copy link
Member Author

@winlinvip winlinvip Mar 20, 2020

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

Comment on lines 489 to 491
<< "a=rtpmap:97 MPEG4/90000" << SRS_RTSP_CRLF
<< "a=rtpmap:98 H264/90000" << SRS_RTSP_CRLF
<< "a=rtpmap:99 H265/90000" << SRS_RTSP_CRLF
Copy link
Contributor

@wasphin wasphin Mar 24, 2020

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

Copy link
Contributor

@xialixin xialixin Mar 31, 2020

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-io
Copy link

codecov-io commented Mar 31, 2020

Codecov Report

Merging #1656 into develop will not change coverage by %.
The diff coverage is n/a.

Impacted file tree graph

@@           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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data'

Translated to English:

Δ = absolute <relative> (impact), ø = not affected, ? = missing data'
Powered by Codecov. Last update 6012ac4...6012ac4. Read the comment docs.

TRANS_BY_GPT3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
TransByAI Translated by AI/GPT.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants