Merge branch 'srs.master'

@@ -171,8 +171,13 @@ int main(int argc, char** argv)
         if (srs_write_packet(rtmp, type, timestamp, rtmp_data, rtmp_size) != 0) {
         if (srs_write_packet(rtmp, type, timestamp, rtmp_data, rtmp_size) != 0) {
             goto rtmp_destroy;
             goto rtmp_destroy;
         }
         }
-        srs_trace("sent packet: type=%s, time=%d, size=%d, fps=%d", 
-            srs_type2string(type), timestamp, rtmp_size, fps);
+        
+        // 5bits, 7.3.1 NAL unit syntax, 
+        // H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
+        u_int8_t nut = (char)data[0] & 0x1f;
+        srs_trace("sent packet: type=%s, time=%d, size=%d, fps=%d, b[0]=%#x(%s)", 
+            srs_type2string(type), timestamp, rtmp_size, fps, nut,
+            (nut == 7? "SPS":(nut == 8? "PPS":(nut == 5? "I":(nut == 1? "P":"Unknown")))));
         
         
         // @remark, when use encode device, it not need to sleep.
         // @remark, when use encode device, it not need to sleep.
         usleep(1000 / fps * 1000);
         usleep(1000 / fps * 1000);

@@ -998,10 +998,53 @@ char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize)
 
 
 int srs_h264_to_rtmp(char* h264_raw_data, int h264_raw_size, u_int32_t dts, u_int32_t pts, char** prtmp_data, int* prtmp_size, u_int32_t* ptimestamp)
 int srs_h264_to_rtmp(char* h264_raw_data, int h264_raw_size, u_int32_t dts, u_int32_t pts, char** prtmp_data, int* prtmp_size, u_int32_t* ptimestamp)
 {
 {
-    *prtmp_data = new char[h264_raw_size];
-    memcpy(*prtmp_data, h264_raw_data, h264_raw_size);
-    
-    *prtmp_size = h264_raw_size;
+    srs_assert(h264_raw_size > 0);
+    
+    // the timestamp in rtmp message header is dts.
+    *ptimestamp = dts;
+    
+    // for h264 in RTMP video payload, there is 5bytes header:
+    //      1bytes, FrameType | CodecID
+    //      1bytes, AVCPacketType
+    //      3bytes, CompositionTime, the cts.
+    // @see: E.4.3 Video Tags, video_file_format_spec_v10_1.pdf, page 78
+    *prtmp_size = h264_raw_size + 5;
+    char* p = new char[*prtmp_size];
+    memcpy(p + 5, h264_raw_data, h264_raw_size);
+    *prtmp_data = p;
+    
+    // 5bits, 7.3.1 NAL unit syntax, 
+    // H.264-AVC-ISO_IEC_14496-10.pdf, page 44.
+    //  7: SPS, 8: PPS, 5: I Frame, 1: P Frame
+    u_int8_t nal_unit_type = (char)h264_raw_data[0] & 0x1f;
+    
+    // Frame Type, Type of video frame.
+    // @see: E.4.3 Video Tags, video_file_format_spec_v10_1.pdf, page 78
+    int8_t frame_type = SrsCodecVideoAVCFrameInterFrame;
+    if (nal_unit_type != 1) {
+        frame_type = SrsCodecVideoAVCFrameKeyFrame;
+    }
+    // CodecID, Codec Identifier.
+    int8_t codec_id = SrsCodecVideoAVC;
+    // set the rtmp header
+    *p++ = (frame_type << 4) | codec_id;
+    
+    // AVCPacketType
+    if (nal_unit_type == 7 || nal_unit_type == 8) {
+        *p++ = SrsCodecVideoAVCTypeSequenceHeader;
+    } else {
+        *p++ = SrsCodecVideoAVCTypeNALU;
+    }
+
+    // CompositionTime
+    // pts = dts + cts, or 
+    // cts = pts - dts.
+    // where cts is the header in rtmp video packet payload header.
+    u_int32_t cts = pts - dts;
+    char* pp = (char*)&cts;
+    *p++ = pp[2];
+    *p++ = pp[1];
+    *p++ = pp[0];
     
     
     return 0;
     return 0;
 }
 }

@@ -339,14 +339,16 @@ extern char* srs_amf0_human_print(srs_amf0_t amf0, char** pdata, int* psize);
 /**
 /**
 * convert h264 stream data to rtmp packet.
 * convert h264 stream data to rtmp packet.
 * @param h264_raw_data the input h264 raw data, a encoded h.264 I/P/B frame data.
 * @param h264_raw_data the input h264 raw data, a encoded h.264 I/P/B frame data.
-* @paam h264_raw_size the size of h264 raw data.
+* @paam h264_raw_size the size of h264 raw data. assert > 0.
 * @param dts the dts of h.264 raw data.
 * @param dts the dts of h.264 raw data.
 * @param pts the pts of h.264 raw data.
 * @param pts the pts of h.264 raw data.
 * @param prtmp_data the output rtmp format packet, which can be send by srs_write_packet.
 * @param prtmp_data the output rtmp format packet, which can be send by srs_write_packet.
 * @param prtmp_size the size of rtmp packet, for srs_write_packet.
 * @param prtmp_size the size of rtmp packet, for srs_write_packet.
 * @param ptimestamp the timestamp of rtmp packet, for srs_write_packet.
 * @param ptimestamp the timestamp of rtmp packet, for srs_write_packet.
+* 
 * @remark, user should free the h264_raw_data.
 * @remark, user should free the h264_raw_data.
 * @remark, user should free the prtmp_data if success.
 * @remark, user should free the prtmp_data if success.
+* @remark, the tbn of dts/pts is 1/1000 for RTMP, that is, in ms.
 * 
 * 
 * @return 0, success; otherswise, failed.
 * @return 0, success; otherswise, failed.
 */
 */