diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 8100462be..17ea64fab 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -23,6 +23,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include +/** +* 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 @@ -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 */ diff --git a/trunk/src/app/srs_app_hls.hpp b/trunk/src/app/srs_app_hls.hpp index 5e5ab1492..5197f5d1e 100644 --- a/trunk/src/app/srs_app_hls.hpp +++ b/trunk/src/app/srs_app_hls.hpp @@ -29,6 +29,22 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ #include +/** +* 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 @@ -47,16 +63,6 @@ class SrsPithyPrint; 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,