Support Simulcast Stream (RID Based Simulcast) #2659

johzzy · 2021-10-11T03:08:49Z

Publisher:

Open Simulcast live streaming (/players/rtc_publisher_simulcast.html page)

Player:

Open RTC player (/players/rtc_player.html page)

low: webrtc://127.0.0.1/live/livestream?layer=low
mid: webrtc://127.0.0.1/live/livestream?layer=mid
high: webrtc://127.0.0.1/live/livestream?layer=high

Codecov Report

Merging #2659 (ca7feaa) into feature/simulcast (66c97ee) will decrease coverage by 0.18%.
The diff coverage is 2.83%.

@@                  Coverage Diff                  @@
##           feature/simulcast    #2659      +/-   ##
=====================================================
- Coverage              59.97%   59.79%   -0.19%     
=====================================================
  Files                    121      121              
  Lines                  51235    51394     +159     
=====================================================
+ Hits                   30728    30729       +1     
- Misses                 20507    20665     +158

| Impacted Files | Coverage Δ | |'

Translated to English while maintaining the markdown structure:

'| Impacted Files | Coverage Δ | |
|---|---|---|
| trunk/src/app/srs_app_rtc_conn.cpp | 9.83% <0.00%> (-0.37%) | ⬇️ |
| trunk/src/app/srs_app_rtc_sdp.cpp | 1.31% <0.00%> (-0.05%) | ⬇️ |
| trunk/src/app/srs_app_rtc_source.hpp | 9.09% <ø> (ø) | |
| trunk/src/app/srs_app_server.cpp | 0.00% <0.00%> (ø) | |
| trunk/src/kernel/srs_kernel_rtc_rtp.hpp | 42.85% <ø> (-2.60%) | ⬇️ |

Translated to English while maintaining the markdown structure:

| trunk/src/app/srs_app_rtc_source.hpp | 9.09% <ø> (ø) | |
| trunk/src/app/srs_app_server.cpp | 0.00% <0.00%> (ø) | |
| trunk/src/kernel/srs_kernel_rtc_rtp.hpp | 42.85% <ø> (-2.60%) | ⬇️ |
| trunk/src/app/srs_app_rtc_source.cpp | 12.22% <2.70%> (-0.25%) | ⬇️ |
| trunk/src/kernel/srs_kernel_rtc_rtp.cpp | 17.38% <4.87%> (-0.91%) | ⬇️ |
| trunk/src/app/srs_app_rtc_sdp.hpp | 22.22% <60.00%> (+8.88%) | ⬆️ |

Continue to review full report at Codecov.

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

Translated to English while maintaining the markdown structure:

'> Δ = absolute <relative> (impact), ø = not affected, ? = missing data

Powered by Codecov. Last update 66c97ee...ca7feaa. Read the comment docs.

TRANS_BY_GPT3

…st page.

…t_video_track_descs.

…000;x-google-start-bitrate=6000

xiaozhihong · 2021-12-07T05:55:22Z

trunk/src/app/srs_app_rtc_conn.cpp

@@ -1748,6 +1748,14 @@ void SrsRtcPublishStream::update_send_report_time(uint32_t ssrc, const SrsNtp& n
    }
 }

+void SrsRtcPublishStream::bind_rid(const SrsRidInfo &rid_info) {
+    // NOTE: get unused video_track, and active as rid info.
+    SrsRtcVideoRecvTrack* video_track = get_video_track(0);


What does '0' mean?

TRANS_BY_GPT3

get unused video_track,

Before executing here, multiple tracks will be allocated based on simulcast SDP, with the default SSRC as 0, indicating unused.

When reaching this point, take an unused track and bind it with RID and SSRC.

TRANS_BY_GPT3

xiaozhihong · 2021-12-07T05:58:02Z

trunk/src/app/srs_app_rtc_conn.cpp

@@ -3156,6 +3194,9 @@ srs_error_t SrsRtcConnection::generate_publish_local_sdp(SrsRequest* req, SrsSdp
        }

        SrsVideoPayload* payload = (SrsVideoPayload*)video_track->media_;
+        if (srs_string_contains(req->param,"?numberOfSimulcastLayers=spec3")) {
+            payload->h264_param_.x_google_bitrate = "x-google-min-bitrate=5000;x-google-max-bitrate=8000;x-google-start-bitrate=6000";


Would it be better for the user to control this? For example, the simulcast.html page can modify the SDP answer itself.

TRANS_BY_GPT3

… functions.

./configure --cxx11=off --cxx14=off --ffmpeg-fit=off

xiaozhihong · 2021-12-07T12:17:58Z

trunk/src/app/srs_app_rtc_sdp.cpp

+        }
+    }
+}
+


Please process the following code according to the SRS method. SRS has a structure called Rtp, which does not use the C memory structure but follows the decode method.

TRANS_BY_GPT3

* fix typo. * refactor: update rtc conn. * feat(simulcast): add rtc_publisher_simulcast page. * feat(kSimulcastApiVersionSpecCompliant/js): update txt url in simulcast page. * feat(kSimulcastApiVersionSpecCompliant): support simulcast, use layer=N * Refine(rtc/negotiate_publish_capability): add set_audio_track_desc/set_video_track_descs. * fix: add msid and msid tracker. * feat(kSimulcastApiVersionSpecCompliant): support layer=high,mid,low * feat(simulcast): add x-google-min-bitrate=5000;x-google-max-bitrate=8000;x-google-start-bitrate=6000 * add note about janus_rtp_header/janus_rtp_header_extension and helper functions. * fix build in c++03. ./configure --cxx11=off --cxx14=off --ffmpeg-fit=off * Refactor rid base simulcast code * Mofidy x-google* from cpp code to html Co-authored-by: hondaxiao <hondaxiao@tencent.com>

winlinvip force-pushed the feature/simulcast branch from 3da195c to a015f77 Compare October 13, 2021 01:29

johzzy force-pushed the johnny/feature/simulcast branch from 8135be4 to 386ae5a Compare October 14, 2021 04:35

winlinvip requested a review from xiaozhihong October 18, 2021 10:35

winlinvip assigned xiaozhihong Oct 18, 2021

johzzy force-pushed the johnny/feature/simulcast branch 2 times, most recently from dcd7241 to 83dfa27 Compare November 13, 2021 13:16

winlinvip added the WebRTC WebRTC, RTC2RTMP or RTMP2RTC. label Nov 16, 2021

johzzy force-pushed the johnny/feature/simulcast branch from 83dfa27 to 9d19781 Compare November 20, 2021 06:38

winlinvip force-pushed the feature/simulcast branch from a015f77 to 66c97ee Compare December 4, 2021 04:12

johzzy added 9 commits December 5, 2021 13:04

fix typo.

35ecf82

refactor: update rtc conn.

1d5b242

feat(simulcast): add rtc_publisher_simulcast page.

50dc187

feat(kSimulcastApiVersionSpecCompliant/js): update txt url in simulca…

8d74613

…st page.

feat(kSimulcastApiVersionSpecCompliant): support simulcast, use layer=N

d78fd5a

Refine(rtc/negotiate_publish_capability): add set_audio_track_desc/se…

2c7b9e2

…t_video_track_descs.

fix: add msid and msid tracker.

6f85a5f

feat(kSimulcastApiVersionSpecCompliant): support layer=high,mid,low

0f403f0

feat(simulcast): add x-google-min-bitrate=5000;x-google-max-bitrate=8…

99c83c6

…000;x-google-start-bitrate=6000

johzzy force-pushed the johnny/feature/simulcast branch from 9d19781 to 8eb5f55 Compare December 5, 2021 05:09

xiaozhihong reviewed Dec 7, 2021

View reviewed changes

johzzy force-pushed the johnny/feature/simulcast branch from 8eb5f55 to 21ff425 Compare December 7, 2021 06:07

johzzy added 2 commits December 7, 2021 14:11

add note about janus_rtp_header/janus_rtp_header_extension and helper…

8533063

… functions.

fix build in c++03.

2fc541c

./configure --cxx11=off --cxx14=off --ffmpeg-fit=off

johzzy force-pushed the johnny/feature/simulcast branch from 21ff425 to 2fc541c Compare December 7, 2021 06:12

xiaozhihong reviewed Dec 7, 2021

View reviewed changes

Refactor rid base simulcast code

a38ad9b

xiaozhihong self-requested a review December 14, 2021 05:57

Mofidy x-google* from cpp code to html

ca7feaa

winlinvip added the TransByAI Translated by AI/GPT. label Jul 29, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support Simulcast Stream (RID Based Simulcast) #2659

Support Simulcast Stream (RID Based Simulcast) #2659

johzzy commented Oct 11, 2021 •

edited by winlinvip

Loading

codecov-commenter commented Oct 11, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading

johzzy Dec 7, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading

Support Simulcast Stream (RID Based Simulcast) #2659

Support Simulcast Stream (RID Based Simulcast) #2659

Conversation

johzzy commented Oct 11, 2021 • edited by winlinvip Loading

Publisher:

Player:

codecov-commenter commented Oct 11, 2021 • edited by winlinvip Loading

Codecov Report

xiaozhihong Dec 7, 2021 • edited by winlinvip Loading

Choose a reason for hiding this comment

johzzy Dec 7, 2021 • edited by winlinvip Loading

Choose a reason for hiding this comment

xiaozhihong Dec 7, 2021 • edited by winlinvip Loading

Choose a reason for hiding this comment

xiaozhihong Dec 7, 2021 • edited by winlinvip Loading

Choose a reason for hiding this comment

johzzy commented Oct 11, 2021 •

edited by winlinvip

Loading

codecov-commenter commented Oct 11, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading

johzzy Dec 7, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading

xiaozhihong Dec 7, 2021 •

edited by winlinvip

Loading