winlin

Merge branch '2.0release' into develop

@@ -95,7 +95,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git @@ -95,7 +95,7 @@ git clone https://gitlab.com/winlinvip/srs-gitlab.git
95 95
96 <pre> 96 <pre>
97 git clone https://github.com/simple-rtmp-server/srs && 97 git clone https://github.com/simple-rtmp-server/srs &&
98 -cd simple-rtmp-server/trunk 98 +cd srs/trunk
99 </pre> 99 </pre>
100 100
101 <strong>Step 2:</strong> build SRS, 101 <strong>Step 2:</strong> build SRS,
@@ -48,7 +48,16 @@ public: @@ -48,7 +48,16 @@ public:
48 ISrsAsyncCallTask(); 48 ISrsAsyncCallTask();
49 virtual ~ISrsAsyncCallTask(); 49 virtual ~ISrsAsyncCallTask();
50 public: 50 public:
  51 + /**
  52 + * execute the task async.
  53 + * this method is the actual execute method of task,
  54 + * for example, to notify callback server.
  55 + */
51 virtual int call() = 0; 56 virtual int call() = 0;
  57 + /**
  58 + * convert task to string to describe it.
  59 + * used for logger.
  60 + */
52 virtual std::string to_string() = 0; 61 virtual std::string to_string() = 0;
53 }; 62 };
54 63