external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 3.0release into harlanc-3.0release

Browse source
This commit is contained in:
winlin 2018-08-25 18:12:39 +08:00
commit 522fba99aa
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
trunk/src/app/srs_app_hls.cpp
View file

@ -1210,6 +1210,7 @@ srs_error_t SrsHls::on_audio(SrsSharedPtrMessage* shared_audio, SrsFormat* forma
// Use the diff to guess whether the samples is 1024 or 960.
int nb_samples_per_frame = 1024;
int diff = ::abs((int)(audio->timestamp - previous_audio_dts)) * srs_flv_srates[format->acodec->sound_rate];
previous_audio_dts = audio->timestamp;
if (diff > 100 && diff < 950) {
nb_samples_per_frame = 960;
}

2
trunk/src/core/srs_core.hpp
View file

@ -27,7 +27,7 @@
// current release version
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 40
#define VERSION_REVISION 41
// generated by configure, only macros.
#include <srs_auto_headers.hpp>