refine hls, extract the flv/aac sample rates

@@ -76,6 +76,22 @@ using namespace std;
 // in ms, for HLS aac flush the audio
 // in ms, for HLS aac flush the audio
 #define SRS_CONF_DEFAULT_AAC_DELAY 100
 #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
 // @see: ngx_rtmp_mpegts_header
 u_int8_t mpegts_header[] = {
 u_int8_t mpegts_header[] = {
     /* TS */
     /* TS */
@@ -377,21 +393,11 @@ SrsHlsAacJitter::~SrsHlsAacJitter()
 
 
 int64_t SrsHlsAacJitter::on_buffer_start(int64_t flv_pts, int sample_rate, int aac_sample_rate)
 int64_t SrsHlsAacJitter::on_buffer_start(int64_t flv_pts, int sample_rate, int aac_sample_rate)
 {
 {
-    // 0 = 5.5 kHz = 5512 Hz
-    // 1 = 11 kHz = 11025 Hz
-    // 2 = 22 kHz = 22050 Hz
-    // 3 = 44 kHz = 44100 Hz
-    static int flv_sample_rates[] = {5512, 11025, 22050, 44100};
+    // use sample rate in flv/RTMP.
     int flv_sample_rate = flv_sample_rates[sample_rate & 0x03];
     int flv_sample_rate = flv_sample_rates[sample_rate & 0x03];
 
 
-    // reset the sample rate by sequence header
+    // override the sample rate by sequence header
     if (aac_sample_rate != _SRS_AAC_SAMPLE_RATE_UNSET) {
     if (aac_sample_rate != _SRS_AAC_SAMPLE_RATE_UNSET) {
-        static int aac_sample_rates[] = {
-            96000, 88200, 64000, 48000,
-            44100, 32000, 24000, 22050,
-            16000, 12000, 11025,  8000,
-            7350,     0,     0,    0
-        };
         flv_sample_rate = aac_sample_rates[aac_sample_rate];
         flv_sample_rate = aac_sample_rates[aac_sample_rate];
     }
     }
 
 

@@ -48,6 +48,16 @@ class SrsSource;
 class SrsFileWriter;
 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,
 * jitter correct for audio,
 * the sample rate 44100/32000 will lost precise,
 * the sample rate 44100/32000 will lost precise,
 * when mp4/ts(tbn=90000) covert to flv/rtmp(1000),
 * when mp4/ts(tbn=90000) covert to flv/rtmp(1000),

@@ -1082,15 +1082,8 @@ int SrsSource::on_audio(SrsMessage* audio)
             return ret;
             return ret;
         }
         }
         
         
-        static int flv_sample_rates[] = {5512, 11025, 22050, 44100, 0};
         static int flv_sample_sizes[] = {8, 16, 0};
         static int flv_sample_sizes[] = {8, 16, 0};
         static int flv_sound_types[] = {1, 2, 0};
         static int flv_sound_types[] = {1, 2, 0};
-        static int aac_sample_rates[] = {
-            96000, 88200, 64000, 48000,
-            44100, 32000, 24000, 22050,
-            16000, 12000, 11025,  8000,
-            7350,     0,     0,    0
-        };
         srs_trace("%dB audio sh, "
         srs_trace("%dB audio sh, "
             "codec(%d, profile=%d, %dchannels, %dkbps, %dHZ), "
             "codec(%d, profile=%d, %dchannels, %dkbps, %dHZ), "
             "flv(%dbits, %dchannels, %dHZ)", 
             "flv(%dbits, %dchannels, %dHZ)", 

@@ -41,11 +41,21 @@ namespace _srs_internal
     /**
     /**
     * the schema type.
     * the schema type.
     */
     */
-    enum srs_schema_type {
-        srs_schema0 = 0, // key-digest sequence
-        // @remark, FMS requires the schema1(digest-key), or connect failed.
-        srs_schema1 = 1, // digest-key sequence
+    enum srs_schema_type 
+    {
         srs_schema_invalid = 2,
         srs_schema_invalid = 2,
+        
+        /**
+        * key-digest sequence
+        */
+        srs_schema0 = 0,
+        
+        /**
+        * digest-key sequence
+        * @remark, FMS requires the schema1(digest-key), or connect failed.
+        */
+        // 
+        srs_schema1 = 1,
     };
     };
     
     
     /**
     /**