Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
继续操作前请注册或者登录。
Authored by
winlin
2014-07-13 13:42:08 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
ccd99381e6811374f75baebc33cd038c88c162f0
ccd99381
1 parent
e53655ee
fix bug, when disable all, some code of HLS must be exported.
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
38 行增加
和
26 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.hpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
ccd9938
...
...
@@ -23,6 +23,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_hls.hpp>
/**
* the public data, event HLS disable, others can use it.
*/
// 0 = 5.5 kHz = 5512 Hz
// 1 = 11 kHz = 11025 Hz
// 2 = 22 kHz = 22050 Hz
// 3 = 44 kHz = 44100 Hz
int
flv_sample_rates
[]
=
{
5512
,
11025
,
22050
,
44100
};
// the sample rates in the codec,
// in the sequence header.
int
aac_sample_rates
[]
=
{
96000
,
88200
,
64000
,
48000
,
44100
,
32000
,
24000
,
22050
,
16000
,
12000
,
11025
,
8000
,
7350
,
0
,
0
,
0
};
/**
* the HLS section, only available when HLS enabled.
*/
#ifdef SRS_AUTO_HLS
#include <sys/types.h>
...
...
@@ -76,22 +98,6 @@ using namespace std;
// in ms, for HLS aac flush the audio
#define SRS_CONF_DEFAULT_AAC_DELAY 100
// 0 = 5.5 kHz = 5512 Hz
// 1 = 11 kHz = 11025 Hz
// 2 = 22 kHz = 22050 Hz
// 3 = 44 kHz = 44100 Hz
int
flv_sample_rates
[]
=
{
5512
,
11025
,
22050
,
44100
};
// the sample rates in the codec,
// in the sequence header.
int
aac_sample_rates
[]
=
{
96000
,
88200
,
64000
,
48000
,
44100
,
32000
,
24000
,
22050
,
16000
,
12000
,
11025
,
8000
,
7350
,
0
,
0
,
0
};
// @see: ngx_rtmp_mpegts_header
u_int8_t
mpegts_header
[]
=
{
/* TS */
...
...
trunk/src/app/srs_app_hls.hpp
查看文件 @
ccd9938
...
...
@@ -29,6 +29,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
/**
* the public data, event HLS disable, others can use it.
*/
/**
* the flv sample rate map
*/
extern
int
flv_sample_rates
[];
/**
* the aac sample rate map
*/
extern
int
aac_sample_rates
[];
/**
* the HLS section, only available when HLS enabled.
*/
#ifdef SRS_AUTO_HLS
#include <string>
...
...
@@ -48,16 +64,6 @@ class SrsSource;
class
SrsFileWriter
;
/**
* the flv sample rate map
*/
extern
int
flv_sample_rates
[];
/**
* the aac sample rate map
*/
extern
int
aac_sample_rates
[];
/**
* jitter correct for audio,
* the sample rate 44100/32000 will lost precise,
* when mp4/ts(tbn=90000) covert to flv/rtmp(1000),
...
...
请
注册
或
登录
后发表评论