github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use time jitter off for hls and forward. 1.0.33

Browse Source
pull/549/merge
winlin 10 years ago
parent dea0b4fc3e
commit 127daa41b1
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File

1
README.md
Unescape Escape View File

@ -244,6 +244,7 @@ Supported operating systems and hardware:
## History ## History
* v1.0, 2015-07-14, use time jitter off for hls and forward. 1.0.33
* <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> * <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>
* 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 * 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
* v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31. * v1.0, 2015-03-26, fix hls aac adts bug, in aac mux. 1.0.31.

6
trunk/src/app/srs_app_forward.cpp
Unescape Escape View File

@ -160,7 +160,7 @@ int SrsForwarder::on_meta_data(SrsSharedPtrMessage* metadata)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
if ((ret = jitter->correct(metadata, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { if ((ret = jitter->correct(metadata, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) {
srs_freep(metadata); srs_freep(metadata);
return ret; return ret;
} }
@ -176,7 +176,7 @@ int SrsForwarder::on_audio(SrsSharedPtrMessage* msg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) {
srs_freep(msg); srs_freep(msg);
return ret; return ret;
} }
@ -197,7 +197,7 @@ int SrsForwarder::on_video(SrsSharedPtrMessage* msg)
{ {
int ret = ERROR_SUCCESS; int ret = ERROR_SUCCESS;
if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { if ((ret = jitter->correct(msg, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) {
srs_freep(msg); srs_freep(msg);
return ret; return ret;
} }

4
trunk/src/app/srs_app_hls.cpp
Unescape Escape View File

@ -1472,7 +1472,7 @@ int SrsHls::on_audio(SrsSharedPtrMessage* audio)
return hls_cache->on_sequence_header(muxer); return hls_cache->on_sequence_header(muxer);
} }
if ((ret = jitter->correct(audio, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { if ((ret = jitter->correct(audio, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) {
srs_error("rtmp jitter correct audio failed. ret=%d", ret); srs_error("rtmp jitter correct audio failed. ret=%d", ret);
return ret; return ret;
} }
@ -1523,7 +1523,7 @@ int SrsHls::on_video(SrsSharedPtrMessage* video)
return hls_cache->on_sequence_header(muxer); return hls_cache->on_sequence_header(muxer);
} }
if ((ret = jitter->correct(video, 0, 0, SrsRtmpJitterAlgorithmFULL)) != ERROR_SUCCESS) { if ((ret = jitter->correct(video, 0, 0, SrsRtmpJitterAlgorithmOFF)) != ERROR_SUCCESS) {
srs_error("rtmp jitter correct video failed. ret=%d", ret); srs_error("rtmp jitter correct video failed. ret=%d", ret);
return ret; return ret;
} }

2
trunk/src/core/srs_core.hpp
Unescape Escape View File

@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version // current release version
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 32 #define VERSION_REVISION 33
// server info. // server info.
#define RTMP_SIG_SRS_KEY "SRS" #define RTMP_SIG_SRS_KEY "SRS"

Write Preview
Loading…
Cancel
Save