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

Support composited bridges for 1:N protocols converting. v6.0.41 #3392

Merged
merged 22 commits into from
Apr 1, 2023
Merged

Support composited bridges for 1:N protocols converting. v6.0.41 #3392

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c20eb1d
Rename bridges to better name
winlinvip Jan 28, 2023
5abaacc
Fix typo, bridger to bridge
winlinvip Jan 28, 2023
16dcf79
Refine SrsRtmpToRtcBridge interface to on_frame.
winlinvip Jan 28, 2023
e27a407
Extract frame builder for RTC to RTMP bridge.
winlinvip Jan 28, 2023
e691588
Fix build fail.
winlinvip Jan 28, 2023
6b0e711
Extract frame builder for SRT to RTMP bridge.
winlinvip Jan 28, 2023
9575d06
Extract stream bridge interface for all bridge.
winlinvip Jan 28, 2023
6875547
Merge SRT/RTC to RTMP bridge to Frame bridge.
winlinvip Jan 28, 2023
adcb51c
Move SrsRtmpToRtcBridge to stream bridge file.
winlinvip Jan 28, 2023
e9dfe3d
Rename SrsRtmpToRtcBridge to SrsFrameToRtcBridge
winlinvip Jan 28, 2023
368af29
Extract rtc rtp builder from AV frame.
winlinvip Jan 28, 2023
f139e6c
Use composite bridge for coverting SRT to RTMP and RTC.
winlinvip Jan 28, 2023
75f6cd5
Fix build fail.
winlinvip Jan 28, 2023
de2437a
Merge develop.
winlinvip Feb 18, 2023
66976b1
Merge branch 'develop' into feature/bridge-chain
winlinvip Feb 25, 2023
d5efe6a
Always use composite bridge.
winlinvip Feb 25, 2023
619f71a
Merge branch 'develop' into feature/bridge-chain
winlinvip Mar 28, 2023
1f8f06d
Check whether SRT stream is busy when publishing RTMP or RTC.
winlinvip Mar 28, 2023
2f8bc87
Update Release note.
winlinvip Mar 31, 2023
91775a0
Merge branch 'develop' into feature/bridge-chain
winlinvip Apr 1, 2023
1d84e68
Update
winlinvip Apr 1, 2023
0b69b5e
Update
winlinvip Apr 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion trunk/configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ if [[ $SRS_FFMPEG_FIT == YES ]]; then
fi
MODULE_FILES=("srs_app_server" "srs_app_conn" "srs_app_rtmp_conn" "srs_app_source"
"srs_app_refer" "srs_app_hls" "srs_app_forward" "srs_app_encoder" "srs_app_http_stream"
"srs_app_st" "srs_app_log" "srs_app_config"
"srs_app_st" "srs_app_log" "srs_app_config" "srs_app_stream_bridge"
"srs_app_pithy_print" "srs_app_reload" "srs_app_http_api" "srs_app_http_conn" "srs_app_http_hooks"
"srs_app_ingest" "srs_app_ffmpeg" "srs_app_utility" "srs_app_edge"
"srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_rtc_conn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcSourceDescripti
// especially for stream merging.
rtmp->set_cache(false);

SrsRtmpFromRtcBridge *bridge = new SrsRtmpFromRtcBridge(rtmp);
SrsFrameToRtmpBridge* bridge = new SrsFrameToRtmpBridge(rtmp);
winlinvip marked this conversation as resolved.
Show resolved Hide resolved
if ((err = bridge->initialize(r)) != srs_success) {
srs_freep(bridge);
return srs_error_wrap(err, "create bridge");
Expand Down
Loading