Merge branch '2.0release' into develop

trunk/src/app/srs_app_ffmpeg.cpp

@@ -330,21 +330,21 @@ int SrsFFMPEG::start()
     }
     
     // the codec params is disabled when copy
-    if (acodec != SRS_RTMP_ENCODER_COPY && acodec != SRS_RTMP_ENCODER_NO_AUDIO) {
-        params.push_back("-b:a");
-        snprintf(tmp, sizeof(tmp), "%d", abitrate * 1000);
-        params.push_back(tmp);
-        
-        params.push_back("-ar");
-        snprintf(tmp, sizeof(tmp), "%d", asample_rate);
-        params.push_back(tmp);
-        
-        params.push_back("-ac");
-        snprintf(tmp, sizeof(tmp), "%d", achannels);
-        params.push_back(tmp);
-        
-        // aparams
-        if (!aparams.empty()) {
+    if (acodec != SRS_RTMP_ENCODER_NO_AUDIO) {
+        if (acodec != SRS_RTMP_ENCODER_COPY) {
+            params.push_back("-b:a");
+            snprintf(tmp, sizeof(tmp), "%d", abitrate * 1000);
+            params.push_back(tmp);
+            
+            params.push_back("-ar");
+            snprintf(tmp, sizeof(tmp), "%d", asample_rate);
+            params.push_back(tmp);
+            
+            params.push_back("-ac");
+            snprintf(tmp, sizeof(tmp), "%d", achannels);
+            params.push_back(tmp);
+            
+            // aparams
             std::vector<std::string>::iterator it;
             for (it = aparams.begin(); it != aparams.end(); ++it) {
                 std::string p = *it;
@@ -352,6 +352,20 @@ int SrsFFMPEG::start()
                     params.push_back(p);
                 }
             }
+        } else {
+            // for audio copy.
+            for (int i = 0; i < (int)aparams.size();) {
+                std::string pn = aparams[i++];
+                
+                // aparams, the adts to asc filter "-bsf:a aac_adtstoasc"
+                if (pn == "-bsf:a" && i < (int)aparams.size()) {
+                    std::string pv = aparams[i++];
+                    if (pv == "aac_adtstoasc") {
+                        params.push_back(pn);
+                        params.push_back(pv);
+                    }
+                }
+            }
         }
     }
 

trunk/src/app/srs_app_http.cpp

@@ -1401,7 +1401,7 @@ int SrsHttpParser::parse_message(SrsStSocket* skt, SrsHttpMessage** ppmsg)
     header = http_parser();
     url = "";
     headers.clear();
-    body_parsed = 0;
+    header_parsed = 0;
     
     // do parse
     if ((ret = parse_message_imp(skt)) != ERROR_SUCCESS) {
@@ -1437,12 +1437,12 @@ int SrsHttpParser::parse_message_imp(SrsStSocket* skt)
         // when buffer not empty, parse it.
         if (buffer->size() > 0) {
             nparsed = http_parser_execute(&parser, &settings, buffer->bytes(), buffer->size());
-            srs_info("buffer=%d, nparsed=%d, body=%d", buffer->size(), (int)nparsed, body_parsed);
+            srs_info("buffer=%d, nparsed=%d, header=%d", buffer->size(), (int)nparsed, header_parsed);
         }
         
         // consume the parsed bytes.
-        if (nparsed && nparsed - body_parsed > 0) {
-            buffer->read_slice((int)nparsed - (int)body_parsed);
+        if (nparsed && header_parsed) {
+            buffer->read_slice(header_parsed);
         }
 
         // ok atleast header completed,
@@ -1491,6 +1491,7 @@ int SrsHttpParser::on_headers_complete(http_parser* parser)
     obj->header = *parser;
     // save the parser when header parse completed.
     obj->state = SrsHttpParseStateHeaderComplete;
+    obj->header_parsed = (int)parser->nread;
     
     srs_info("***HEADERS COMPLETE***");
     
@@ -1567,8 +1568,6 @@ int SrsHttpParser::on_body(http_parser* parser, const char* at, size_t length)
     SrsHttpParser* obj = (SrsHttpParser*)parser->data;
     srs_assert(obj);
     
-    obj->body_parsed += length;
-    
     srs_info("Body: %.*s", (int)length, at);
 
     return 0;

trunk/src/app/srs_app_http.hpp

@@ -599,7 +599,7 @@ private:
     http_parser header;
     std::string url;
     std::vector<SrsHttpHeaderField> headers;
-    int body_parsed;
+    int header_parsed;
 public:
     SrsHttpParser();
     virtual ~SrsHttpParser();

trunk/src/app/srs_app_log.cpp

@@ -274,7 +274,7 @@ bool SrsFastLog::generate_header(bool error, const char* tag, int context_id, co
     
     // to calendar time
     struct tm* tm;
-    if (_srs_config->get_utc_time()) {
+    if (_srs_config && _srs_config->get_utc_time()) {
         if ((tm = gmtime(&tv.tv_sec)) == NULL) {
             return false;
         }

trunk/src/kernel/srs_kernel_ts.cpp

@@ -169,6 +169,23 @@ int SrsTsMessage::stream_number()
     return -1;
 }
 
+SrsTsMessage* SrsTsMessage::detach()
+{
+    // @remark the packet cannot be used, but channel is ok.
+    SrsTsMessage* cp = new SrsTsMessage(channel, NULL);
+    cp->start_pts = start_pts;
+    cp->write_pcr = write_pcr;
+    cp->is_discontinuity = is_discontinuity;
+    cp->dts = dts;
+    cp->pts = pts;
+    cp->sid = sid;
+    cp->PES_packet_length = PES_packet_length;
+    cp->continuity_counter = continuity_counter;
+    cp->payload = payload;
+    payload = NULL;
+    return cp;
+}
+
 ISrsTsHandler::ISrsTsHandler()
 {
 }

trunk/src/kernel/srs_kernel_ts.hpp

@@ -309,6 +309,13 @@ public:
     * @return the stream number for audio/video; otherwise, -1.
     */
     virtual int stream_number();
+public:
+    /**
+     * detach the ts message,
+     * for user maybe need to parse the message by queue.
+     * @remark we always use the payload of original message.
+     */
+    virtual SrsTsMessage* detach();
 };
 
 /**