Skip to content

Commit 6e1134f

Browse files
winlinvipchen-guanghua
winlinvip
and
chen-guanghua
authored
Use clang format. v7.0.52 (ossrs#4433)
--------- Co-authored-by: ChenGH <chengh_math@126.com>
1 parent a59d172 commit 6e1134f

277 files changed

Lines changed: 45761 additions & 35921 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎trunk/doc/CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ The changelog for SRS.
77
<a name="v7-changes"></a>
88

99
## SRS 7.0 Changelog
10+
* v7.0, 2025-08-11, Merge [#4433](https://github.com/ossrs/srs/pull/4433): Use clang format. v7.0.52 (#4433)
1011
* v7.0, 2025-08-11, Merge [#4159](https://github.com/ossrs/srs/pull/4159): Feature: Support HLS with fmp4 segment for HEVC/LLHLS. v7.0.51 (#4159)
1112
* v7.0, 2025-08-11, Merge [#4432](https://github.com/ossrs/srs/pull/4432): AI: HTTP-FLV: Fix heap-use-after-free crash during stream unmount. v7.0.50 (#4432)
1213
* v7.0, 2025-07-28, Merge [#4245](https://github.com/ossrs/srs/pull/4245): Allow Forward to be configured with Env Var. v7.0.49 (#4245)

‎trunk/src/app/srs_app_async_call.cpp‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,25 @@ SrsAsyncCallWorker::SrsAsyncCallWorker()
2929
SrsAsyncCallWorker::~SrsAsyncCallWorker()
3030
{
3131
srs_freep(trd);
32-
33-
std::vector<ISrsAsyncCallTask*>::iterator it;
32+
33+
std::vector<ISrsAsyncCallTask *>::iterator it;
3434
for (it = tasks.begin(); it != tasks.end(); ++it) {
35-
ISrsAsyncCallTask* task = *it;
35+
ISrsAsyncCallTask *task = *it;
3636
srs_freep(task);
3737
}
3838
tasks.clear();
39-
39+
4040
srs_cond_destroy(wait);
4141
srs_mutex_destroy(lock);
4242
}
4343

44-
srs_error_t SrsAsyncCallWorker::execute(ISrsAsyncCallTask* t)
44+
srs_error_t SrsAsyncCallWorker::execute(ISrsAsyncCallTask *t)
4545
{
4646
srs_error_t err = srs_success;
47-
47+
4848
tasks.push_back(t);
4949
srs_cond_signal(wait);
50-
50+
5151
return err;
5252
}
5353

@@ -59,14 +59,14 @@ int SrsAsyncCallWorker::count()
5959
srs_error_t SrsAsyncCallWorker::start()
6060
{
6161
srs_error_t err = srs_success;
62-
62+
6363
srs_freep(trd);
6464
trd = new SrsSTCoroutine("async", this, _srs_context->get_id());
65-
65+
6666
if ((err = trd->start()) != srs_success) {
6767
return srs_error_wrap(err, "coroutine");
6868
}
69-
69+
7070
return err;
7171
}
7272

@@ -80,19 +80,19 @@ void SrsAsyncCallWorker::stop()
8080
srs_error_t SrsAsyncCallWorker::cycle()
8181
{
8282
srs_error_t err = srs_success;
83-
83+
8484
while (true) {
8585
if ((err = trd->pull()) != srs_success) {
8686
return srs_error_wrap(err, "async call worker");
8787
}
88-
88+
8989
if (tasks.empty()) {
9090
srs_cond_wait(wait);
9191
}
9292

9393
flush_tasks();
9494
}
95-
95+
9696
return err;
9797
}
9898

@@ -101,7 +101,7 @@ void SrsAsyncCallWorker::flush_tasks()
101101
srs_error_t err = srs_success;
102102

103103
// Avoid the async call blocking other coroutines.
104-
std::vector<ISrsAsyncCallTask*> copy;
104+
std::vector<ISrsAsyncCallTask *> copy;
105105
if (true) {
106106
SrsLocker(lock);
107107

@@ -113,9 +113,9 @@ void SrsAsyncCallWorker::flush_tasks()
113113
tasks.clear();
114114
}
115115

116-
std::vector<ISrsAsyncCallTask*>::iterator it;
116+
std::vector<ISrsAsyncCallTask *>::iterator it;
117117
for (it = copy.begin(); it != copy.end(); ++it) {
118-
ISrsAsyncCallTask* task = *it;
118+
ISrsAsyncCallTask *task = *it;
119119

120120
if ((err = task->call()) != srs_success) {
121121
srs_warn("ignore task failed %s", srs_error_desc(err).c_str());
@@ -124,5 +124,3 @@ void SrsAsyncCallWorker::flush_tasks()
124124
srs_freep(task);
125125
}
126126
}
127-
128-

‎trunk/src/app/srs_app_async_call.hpp‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class ISrsAsyncCallTask
2424
public:
2525
ISrsAsyncCallTask();
2626
virtual ~ISrsAsyncCallTask();
27+
2728
public:
2829
// Execute the task async.
2930
// This method is the actual execute method of task,
@@ -40,26 +41,30 @@ class ISrsAsyncCallTask
4041
class SrsAsyncCallWorker : public ISrsCoroutineHandler
4142
{
4243
private:
43-
SrsCoroutine* trd;
44+
SrsCoroutine *trd;
45+
4446
protected:
45-
std::vector<ISrsAsyncCallTask*> tasks;
47+
std::vector<ISrsAsyncCallTask *> tasks;
4648
srs_cond_t wait;
4749
srs_mutex_t lock;
50+
4851
public:
4952
SrsAsyncCallWorker();
5053
virtual ~SrsAsyncCallWorker();
54+
5155
public:
52-
virtual srs_error_t execute(ISrsAsyncCallTask* t);
56+
virtual srs_error_t execute(ISrsAsyncCallTask *t);
5357
virtual int count();
58+
5459
public:
5560
virtual srs_error_t start();
5661
virtual void stop();
57-
// Interface ISrsReusableThreadHandler
62+
// Interface ISrsReusableThreadHandler
5863
public:
5964
virtual srs_error_t cycle();
65+
6066
private:
6167
virtual void flush_tasks();
6268
};
6369

6470
#endif
65-

0 commit comments

Comments
 (0)