正在显示
4 个修改的文件
包含
7 行增加
和
6 行删除
@@ -244,6 +244,7 @@ Supported operating systems and hardware: | @@ -244,6 +244,7 @@ Supported operating systems and hardware: | ||
244 | 244 | ||
245 | ## History | 245 | ## History |
246 | 246 | ||
247 | +* v1.0, 2015-07-14, use time jitter off for hls and forward. 1.0.33 | ||
247 | * <strong>v1.0, 2015-05-23, [1.0r4 release(1.0.32)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4) released. 59509 lines.</strong> | 248 | * <strong>v1.0, 2015-05-23, [1.0r4 release(1.0.32)](https://github.com/simple-rtmp-server/srs/releases/tag/1.0r4) released. 59509 lines.</strong> |
248 | * v1.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 1.0.32 | 249 | * v1.0, 2015-05-22, fix [#397](https://github.com/simple-rtmp-server/srs/issues/397) the USER_HZ maybe not 100. 1.0.32 |
249 | * v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. | 250 | * v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. |
@@ -160,7 +160,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata) | @@ -160,7 +160,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata) | ||
160 | { | 160 | { |
161 | int ret = ERROR_SUCCESS; | 161 | int ret = ERROR_SUCCESS; |
162 | 162 | ||
163 | - if ((ret = jitter->correct(metadata, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { | 163 | + if ((ret = jitter->correct(metadata, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) { |
164 | srs_freep(metadata); | 164 | srs_freep(metadata); |
165 | return ret; | 165 | return ret; |
166 | } | 166 | } |
@@ -176,7 +176,7 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* msg) | @@ -176,7 +176,7 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* msg) | ||
176 | { | 176 | { |
177 | int ret = ERROR_SUCCESS; | 177 | int ret = ERROR_SUCCESS; |
178 | 178 | ||
179 | - if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { | 179 | + if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) { |
180 | srs_freep(msg); | 180 | srs_freep(msg); |
181 | return ret; | 181 | return ret; |
182 | } | 182 | } |
@@ -197,7 +197,7 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* msg) | @@ -197,7 +197,7 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* msg) | ||
197 | { | 197 | { |
198 | int ret = ERROR_SUCCESS; | 198 | int ret = ERROR_SUCCESS; |
199 | 199 | ||
200 | - if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { | 200 | + if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) { |
201 | srs_freep(msg); | 201 | srs_freep(msg); |
202 | return ret; | 202 | return ret; |
203 | } | 203 | } |
@@ -1472,7 +1472,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio) | @@ -1472,7 +1472,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio) | ||
1472 | return hls_cache->on_sequence_header(muxer); | 1472 | return hls_cache->on_sequence_header(muxer); |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | - if ((ret = jitter->correct(audio, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { | 1475 | + if ((ret = jitter->correct(audio, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) { |
1476 | srs_error("rtmp jitter correct audio failed. ret=%d", ret); | 1476 | srs_error("rtmp jitter correct audio failed. ret=%d", ret); |
1477 | return ret; | 1477 | return ret; |
1478 | } | 1478 | } |
@@ -1523,7 +1523,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video) | @@ -1523,7 +1523,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video) | ||
1523 | return hls_cache->on_sequence_header(muxer); | 1523 | return hls_cache->on_sequence_header(muxer); |
1524 | } | 1524 | } |
1525 | 1525 | ||
1526 | - if ((ret = jitter->correct(video, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { | 1526 | + if ((ret = jitter->correct(video, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) { |
1527 | srs_error("rtmp jitter correct video failed. ret=%d", ret); | 1527 | srs_error("rtmp jitter correct video failed. ret=%d", ret); |
1528 | return ret; | 1528 | return ret; |
1529 | } | 1529 | } |
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
31 | // current release version | 31 | // current release version |
32 | #define VERSION_MAJOR 1 | 32 | #define VERSION_MAJOR 1 |
33 | #define VERSION_MINOR 0 | 33 | #define VERSION_MINOR 0 |
34 | -#define VERSION_REVISION 32 | 34 | +#define VERSION_REVISION 33 |
35 | 35 | ||
36 | // server info. | 36 | // server info. |
37 | #define RTMP_SIG_SRS_KEY "SRS" | 37 | #define RTMP_SIG_SRS_KEY "SRS" |
-
请 注册 或 登录 后发表评论