Skip to content

Commit

Permalink
Threads-Hybrid: Fix rebase bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
winlinvip committed Apr 26, 2021
1 parent 9c845c5 commit 614a781
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 13 deletions.
18 changes: 9 additions & 9 deletions trunk/src/app/srs_app_hourglass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ using namespace std;

__thread SrsPps* _srs_pps_timer = NULL;

extern SrsPps* _srs_pps_clock_15ms;
extern SrsPps* _srs_pps_clock_20ms;
extern SrsPps* _srs_pps_clock_25ms;
extern SrsPps* _srs_pps_clock_30ms;
extern SrsPps* _srs_pps_clock_35ms;
extern SrsPps* _srs_pps_clock_40ms;
extern SrsPps* _srs_pps_clock_80ms;
extern SrsPps* _srs_pps_clock_160ms;
extern SrsPps* _srs_pps_timer_s;
extern __thread SrsPps* _srs_pps_clock_15ms;
extern __thread SrsPps* _srs_pps_clock_20ms;
extern __thread SrsPps* _srs_pps_clock_25ms;
extern __thread SrsPps* _srs_pps_clock_30ms;
extern __thread SrsPps* _srs_pps_clock_35ms;
extern __thread SrsPps* _srs_pps_clock_40ms;
extern __thread SrsPps* _srs_pps_clock_80ms;
extern __thread SrsPps* _srs_pps_clock_160ms;
extern __thread SrsPps* _srs_pps_timer_s;

ISrsHourGlass::ISrsHourGlass()
{
Expand Down
1 change: 1 addition & 0 deletions trunk/src/app/srs_app_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1936,6 +1936,7 @@ srs_error_t SrsApiServer::create_session(
) {
srs_error_t err = srs_success;

// TODO: FIXME: Should update the hybrids for RTMP streams.
// Serve all connections of a stream, which identified by url, by the same hybrid thread.
string url = req->get_stream_url();
SrsThreadEntry* hybrid = NULL;
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_threads.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/app/srs_app_threads.hpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version5.cpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion trunk/src/core/srs_core_version5.hpp
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 614a781

Please sign in to comment.