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

SmartPtr: Support load test for source by srs-bench. v6.0.130 #4097

Merged
merged 11 commits into from
Jun 20, 2024
Prev Previous commit
Next Next commit
DASH: Add config description to full.conf.
  • Loading branch information
winlinvip committed Jun 19, 2024
commit ef433a02182b717a642a677dc0c6f1478c962635
15 changes: 15 additions & 0 deletions trunk/conf/full.conf
Original file line number Diff line number Diff line change
Expand Up @@ -1758,6 +1758,21 @@ vhost dash.srs.com {
# Overwrite by env SRS_VHOST_DASH_DASH_MPD_FILE for all vhosts.
# Default: [app]/[stream].mpd
dash_mpd_file [app]/[stream].mpd;
# The dash windows size in seconds.
# Overwrite by env SRS_VHOST_DASH_DASH_WINDOW_SIZE for all vhosts.
# Default: 5
dash_window_size 5;
# whether cleanup the old expired dash files.
# Overwrite by env SRS_VHOST_DASH_DASH_CLEANUP for all vhosts.
# default: on
dash_cleanup on;
# If there is no incoming packets, dispose DASH in this timeout in seconds,
# which removes all DASH files including m3u8 and ts files.
# @remark 0 to disable dispose for publisher.
# @remark apply for publisher timeout only, while "etc/init.d/srs stop" always dispose DASH.
# Overwrite by env SRS_VHOST_DASH_DASH_DISPOSE for all vhosts.
# default: 120
dash_dispose 120;
Copy link
Contributor

Choose a reason for hiding this comment

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

srs_utime_t SrsConfig::get_dash_dispose(std::string vhost)
{
SRS_OVERWRITE_BY_ENV_SECONDS("srs.vhost.dash.dash_dispose"); // SRS_VHOST_DASH_DASH_DISPOSE
static srs_utime_t DEFAULT = 0;

the default value in the code need to match the value here, be careful, change the default value in the srs_app_config may has impact.

Copy link
Member Author

Choose a reason for hiding this comment

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

The previous default value is 0, but hls dispose defaults to 120. I think it's ok to change to the same.

Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't notice the dash_dispose default value in srs_app_config.cpp already changed to 120 to match the full.conf. No problem here.

}
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6863,7 +6863,7 @@ srs_utime_t SrsConfig::get_dash_dispose(std::string vhost)
{
SRS_OVERWRITE_BY_ENV_SECONDS("srs.vhost.dash.dash_dispose"); // SRS_VHOST_DASH_DASH_DISPOSE

static srs_utime_t DEFAULT = 0;
static srs_utime_t DEFAULT = 120;

SrsConfDirective* conf = get_dash(vhost);
if (!conf) {
Expand Down
Loading