Merge branch '2.0release' into develop

@@ -1070,11 +1070,6 @@ int SrsHlsCache::write_video(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t
         //      a. wait keyframe and got keyframe.
         //      a. wait keyframe and got keyframe.
         //      b. always reap when not wait keyframe.
         //      b. always reap when not wait keyframe.
         if (!muxer->wait_keyframe() || sample->frame_type == SrsCodecVideoAVCFrameKeyFrame) {
         if (!muxer->wait_keyframe() || sample->frame_type == SrsCodecVideoAVCFrameKeyFrame) {
-            // when wait keyframe, there must exists idr frame in sample, or NonIDR(open gop) specified.
-            if (!sample->open_gop && !sample->has_idr && muxer->wait_keyframe()) {
-                srs_warn("hls: ts starts without IDR, first nalu=%d, idr=%d", sample->first_nalu_type, sample->has_idr);
-            }
-            
             // reap the segment, which will also flush the video.
             // reap the segment, which will also flush the video.
             if ((ret = reap_segment("video", muxer, cache->video->dts)) != ERROR_SUCCESS) {
             if ((ret = reap_segment("video", muxer, cache->video->dts)) != ERROR_SUCCESS) {
                 return ret;
                 return ret;
@@ -1271,8 +1266,6 @@ void SrsHls::on_unpublish()
         srs_error("ignore m3u8 muxer flush/close audio failed. ret=%d", ret);
         srs_error("ignore m3u8 muxer flush/close audio failed. ret=%d", ret);
     }
     }
     
     
-    sample->reset();
-    
     hls_enabled = false;
     hls_enabled = false;
 }
 }
 
 

@@ -324,20 +324,13 @@ SrsCodecSampleUnit::~SrsCodecSampleUnit()
 
 
 SrsCodecSample::SrsCodecSample()
 SrsCodecSample::SrsCodecSample()
 {
 {
-    reset();
+    clear();
 }
 }
 
 
 SrsCodecSample::~SrsCodecSample()
 SrsCodecSample::~SrsCodecSample()
 {
 {
 }
 }
 
 
-void SrsCodecSample::reset()
-{
-    clear();
-    
-    open_gop = false;
-}
-
 void SrsCodecSample::clear()
 void SrsCodecSample::clear()
 {
 {
     is_video = false;
     is_video = false;
@@ -346,7 +339,7 @@ void SrsCodecSample::clear()
     cts = 0;
     cts = 0;
     frame_type = SrsCodecVideoAVCFrameReserved;
     frame_type = SrsCodecVideoAVCFrameReserved;
     avc_packet_type = SrsCodecVideoAVCTypeReserved;
     avc_packet_type = SrsCodecVideoAVCTypeReserved;
-    has_aud = has_idr = false;
+    has_sps_pps = has_aud = has_idr = false;
     first_nalu_type = SrsAvcNaluTypeReserved;
     first_nalu_type = SrsAvcNaluTypeReserved;
     
     
     acodec = SrsCodecAudioReserved1;
     acodec = SrsCodecAudioReserved1;
@@ -377,6 +370,8 @@ int SrsCodecSample::add_sample_unit(char* bytes, int size)
         
         
         if (nal_unit_type == SrsAvcNaluTypeIDR) {
         if (nal_unit_type == SrsAvcNaluTypeIDR) {
             has_idr = true;
             has_idr = true;
+        } else if (nal_unit_type == SrsAvcNaluTypeSPS || nal_unit_type == SrsAvcNaluTypePPS) {
+            has_sps_pps = true;
         } else if (nal_unit_type == SrsAvcNaluTypeAccessUnitDelimiter) {
         } else if (nal_unit_type == SrsAvcNaluTypeAccessUnitDelimiter) {
             has_aud = true;
             has_aud = true;
         }
         }
@@ -773,11 +768,6 @@ int SrsAvcAacCodec::video_nalu_demux(SrsBuffer* stream, SrsCodecSample* sample)
         srs_info("hls decode avc payload in annexb format.");
         srs_info("hls decode avc payload in annexb format.");
     }
     }
     
     
-    // for keyframe, but not IDR, it's open gop.
-    if (sample->frame_type == SrsCodecVideoAVCFrameKeyFrame && !sample->has_idr) {
-        sample->open_gop = true;
-    }
-    
     return ret;
     return ret;
 }
 }
 
 

@@ -387,13 +387,11 @@ public:
     bool has_idr;
     bool has_idr;
     // Whether exists AUD NALU.
     // Whether exists AUD NALU.
     bool has_aud;
     bool has_aud;
+    // Whether exists SPS/PPS NALU.
+    bool has_sps_pps;
     // The first nalu type.
     // The first nalu type.
     SrsAvcNaluType first_nalu_type;
     SrsAvcNaluType first_nalu_type;
 public:
 public:
-    // Whether stream is open gop, which means the keyframe is not IDR but NonIDR.
-    // @remark we will identify whether stream is open-gop util reset.
-    bool open_gop;
-public:
     // audio specified
     // audio specified
     SrsCodecAudio acodec;
     SrsCodecAudio acodec;
     // audio aac specified.
     // audio aac specified.
@@ -405,8 +403,6 @@ public:
     SrsCodecSample();
     SrsCodecSample();
     virtual ~SrsCodecSample();
     virtual ~SrsCodecSample();
 public:
 public:
-    // Reset the sample, clear the sample-base and stream-base data.
-    void reset();
     /**
     /**
     * clear all samples.
     * clear all samples.
     * the sample units never copy the bytes, it directly use the ptr,
     * the sample units never copy the bytes, it directly use the ptr,

@@ -2939,10 +2939,8 @@ int SrsTsCache::do_cache_aac(SrsAvcAacCodec* codec, SrsCodecSample* sample)
     return ret;
     return ret;
 }
 }
 
 
-int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
+void srs_avc_insert_aud(SrsSimpleBuffer* payload, bool& aud_inserted)
 {
 {
-    int ret = ERROR_SUCCESS;
-    
     // mux the samples in annexb format,
     // mux the samples in annexb format,
     // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 324.
     // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 324.
     /**
     /**
@@ -2989,6 +2987,23 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
     static u_int8_t fresh_nalu_header[] = { 0x00, 0x00, 0x00, 0x01 };
     static u_int8_t fresh_nalu_header[] = { 0x00, 0x00, 0x00, 0x01 };
     static u_int8_t cont_nalu_header[] = { 0x00, 0x00, 0x01 };
     static u_int8_t cont_nalu_header[] = { 0x00, 0x00, 0x01 };
     
     
+    if (!aud_inserted) {
+        aud_inserted = true;
+        payload->append((const char*)fresh_nalu_header, 4);
+    } else {
+        payload->append((const char*)cont_nalu_header, 3);
+    }
+}
+
+int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
+{
+    int ret = ERROR_SUCCESS;
+    
+    // Whether aud inserted.
+    bool aud_inserted = false;
+    
+    // Insert a default AUD NALU when no AUD in samples.
+    if (!sample->has_aud) {
         // the aud(access unit delimiter) before each frame.
         // the aud(access unit delimiter) before each frame.
         // 7.3.2.4 Access unit delimiter RBSP syntax
         // 7.3.2.4 Access unit delimiter RBSP syntax
         // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 66.
         // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 66.
@@ -3019,10 +3034,12 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
         //      8, SP (SP slice)
         //      8, SP (SP slice)
         //      9, SI (SI slice)
         //      9, SI (SI slice)
         // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 105.
         // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 105.
-    static u_int8_t aud_nalu_7[] = { 0x09, 0xf0};
+        static u_int8_t default_aud_nalu[] = { 0x09, 0xf0};
+        srs_avc_insert_aud(video->payload, aud_inserted);
+        video->payload->append((const char*)default_aud_nalu, 2);
+    }
     
     
-    // For NonIDR(open gop), we directly appends all frames.
-    if (sample->open_gop) {
+    // all sample use cont nalu header, except the sps-pps before IDR frame.
     for (int i = 0; i < sample->nb_sample_units; i++) {
     for (int i = 0; i < sample->nb_sample_units; i++) {
         SrsCodecSampleUnit* sample_unit = &sample->sample_units[i];
         SrsCodecSampleUnit* sample_unit = &sample->sample_units[i];
         int32_t size = sample_unit->size;
         int32_t size = sample_unit->size;
@@ -3033,71 +3050,25 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample)
             return ret;
             return ret;
         }
         }
         
         
-            // insert nalu header before rbsp.
-            if (i == 0) {
-                video->payload->append((const char*)fresh_nalu_header, 4);
-            } else {
-                video->payload->append((const char*)cont_nalu_header, 3);
-            }
-            
-            // sample data
-            video->payload->append(sample_unit->bytes, sample_unit->size);
-        }
-        
-        return ret;
-    }
-    
-    // always append a aud nalu for each frame.
-    video->payload->append((const char*)fresh_nalu_header, 4);
-    video->payload->append((const char*)aud_nalu_7, 2);
+        // 5bits, 7.3.1 NAL unit syntax,
+        // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 83.
+        SrsAvcNaluType nal_unit_type = (SrsAvcNaluType)(sample_unit->bytes[0] & 0x1f);
         
         
-    // when ts message(samples) contains IDR, insert sps+pps.
-    if (sample->has_idr) {
-        // fresh nalu header before sps.
+        // Insert sps/pps before IDR when there is no sps/pps in samples.
+        // The sps/pps is parsed from sequence header(generally the first flv packet).
+        if (nal_unit_type == SrsAvcNaluTypeIDR && !sample->has_sps_pps) {
             if (codec->sequenceParameterSetLength > 0) {
             if (codec->sequenceParameterSetLength > 0) {
-            // AnnexB prefix, for sps always 4 bytes header
-            video->payload->append((const char*)fresh_nalu_header, 4);
-            // sps
+                srs_avc_insert_aud(video->payload, aud_inserted);
                 video->payload->append(codec->sequenceParameterSetNALUnit, codec->sequenceParameterSetLength);
                 video->payload->append(codec->sequenceParameterSetNALUnit, codec->sequenceParameterSetLength);
             }
             }
-        // cont nalu header before pps.
             if (codec->pictureParameterSetLength > 0) {
             if (codec->pictureParameterSetLength > 0) {
-            // AnnexB prefix, for pps always 3 bytes header
-            video->payload->append((const char*)cont_nalu_header, 3);
-            // pps
+                srs_avc_insert_aud(video->payload, aud_inserted);
                 video->payload->append(codec->pictureParameterSetNALUnit, codec->pictureParameterSetLength);
                 video->payload->append(codec->pictureParameterSetNALUnit, codec->pictureParameterSetLength);
             }
             }
         }
         }
         
         
-    // all sample use cont nalu header, except the sps-pps before IDR frame.
-    for (int i = 0; i < sample->nb_sample_units; i++) {
-        SrsCodecSampleUnit* sample_unit = &sample->sample_units[i];
-        int32_t size = sample_unit->size;
-        
-        if (!sample_unit->bytes || size <= 0) {
-            ret = ERROR_HLS_AVC_SAMPLE_SIZE;
-            srs_error("invalid avc sample length=%d, ret=%d", size, ret);
-            return ret;
-        }
-        
-        // 5bits, 7.3.1 NAL unit syntax,
-        // H.264-AVC-ISO_IEC_14496-10-2012.pdf, page 83.
-        SrsAvcNaluType nal_unit_type = (SrsAvcNaluType)(sample_unit->bytes[0] & 0x1f);
-        
-        // ignore SPS/PPS/AUD
-        switch (nal_unit_type) {
-            case SrsAvcNaluTypeSPS:
-            case SrsAvcNaluTypePPS:
-            case SrsAvcNaluTypeAccessUnitDelimiter:
-                continue;
-            default:
-                break;
-        }
-        
-        // insert cont nalu header before frame.
-        video->payload->append((const char*)cont_nalu_header, 3);
-        
-        // sample data
+        // Insert the NALU to video in annexb.
+        srs_avc_insert_aud(video->payload, aud_inserted);
         video->payload->append(sample_unit->bytes, sample_unit->size);
         video->payload->append(sample_unit->bytes, sample_unit->size);
     }
     }
     
     
@@ -3144,8 +3115,6 @@ int SrsTsEncoder::initialize(SrsFileWriter* fw)
         return ret;
         return ret;
     }
     }
     
     
-    sample->reset();
-    
     return ret;
     return ret;
 }
 }