Merge 4.0

2025-03-09 15:49:59 +00:00 · 2021-04-16 09:28:53 +08:00 · 2021-04-16 09:28:53 +08:00 · 2ea19a20dd
commit 2ea19a20dd
parent 36743914ff 124455be09
221 changed files with 223 additions and 304 deletions
--- a/trunk/src/protocol/srs_http_stack.cpp
+++ b/trunk/src/protocol/srs_http_stack.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_http_stack.hpp
+++ b/trunk/src/protocol/srs_http_stack.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_amf0.cpp
+++ b/trunk/src/protocol/srs_protocol_amf0.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_amf0.hpp
+++ b/trunk/src/protocol/srs_protocol_amf0.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_format.cpp
+++ b/trunk/src/protocol/srs_protocol_format.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_format.hpp
+++ b/trunk/src/protocol/srs_protocol_format.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_io.cpp
+++ b/trunk/src/protocol/srs_protocol_io.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_io.hpp
+++ b/trunk/src/protocol/srs_protocol_io.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_json.cpp
+++ b/trunk/src/protocol/srs_protocol_json.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
@ -1320,7 +1320,7 @@ void json_value_free (json_value * value)
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_json.hpp
+++ b/trunk/src/protocol/srs_protocol_json.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_kbps.cpp
+++ b/trunk/src/protocol/srs_protocol_kbps.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_kbps.hpp
+++ b/trunk/src/protocol/srs_protocol_kbps.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_stream.cpp
+++ b/trunk/src/protocol/srs_protocol_stream.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_stream.hpp
+++ b/trunk/src/protocol/srs_protocol_stream.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_utility.cpp
+++ b/trunk/src/protocol/srs_protocol_utility.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_protocol_utility.hpp
+++ b/trunk/src/protocol/srs_protocol_utility.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_raw_avc.cpp
+++ b/trunk/src/protocol/srs_raw_avc.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_raw_avc.hpp
+++ b/trunk/src/protocol/srs_raw_avc.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_handshake.cpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_handshake.hpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_msg_array.cpp
+++ b/trunk/src/protocol/srs_rtmp_msg_array.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_msg_array.hpp
+++ b/trunk/src/protocol/srs_rtmp_msg_array.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_stack.cpp
+++ b/trunk/src/protocol/srs_rtmp_stack.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtmp_stack.hpp
+++ b/trunk/src/protocol/srs_rtmp_stack.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtsp_stack.cpp
+++ b/trunk/src/protocol/srs_rtsp_stack.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_rtsp_stack.hpp
+++ b/trunk/src/protocol/srs_rtsp_stack.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_conn.cpp
+++ b/trunk/src/protocol/srs_service_conn.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_conn.hpp
+++ b/trunk/src/protocol/srs_service_conn.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_http_client.cpp
+++ b/trunk/src/protocol/srs_service_http_client.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_http_client.hpp
+++ b/trunk/src/protocol/srs_service_http_client.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_http_conn.cpp
+++ b/trunk/src/protocol/srs_service_http_conn.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_http_conn.hpp
+++ b/trunk/src/protocol/srs_service_http_conn.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_log.cpp
+++ b/trunk/src/protocol/srs_service_log.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_log.hpp
+++ b/trunk/src/protocol/srs_service_log.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_rtmp_conn.cpp
+++ b/trunk/src/protocol/srs_service_rtmp_conn.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_rtmp_conn.hpp
+++ b/trunk/src/protocol/srs_service_rtmp_conn.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_st.cpp
+++ b/trunk/src/protocol/srs_service_st.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_st.hpp
+++ b/trunk/src/protocol/srs_service_st.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
--- a/trunk/src/protocol/srs_service_utility.cpp
+++ b/trunk/src/protocol/srs_service_utility.cpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in
@ -399,4 +399,4 @@ string srs_get_system_hostname()

    _srs_system_hostname = std::string(buf);
    return _srs_system_hostname;
-}
+}
--- a/trunk/src/protocol/srs_service_utility.hpp
+++ b/trunk/src/protocol/srs_service_utility.hpp
@ -1,7 +1,7 @@
 /**
 * The MIT License (MIT)
 *
- * Copyright (c) 2013-2020 Winlin
+ * Copyright (c) 2013-2021 Winlin
 *
 * Permission is hereby granted, free of charge, to any person obtaining a copy of
 * this software and associated documentation files (the "Software"), to deal in