winlin

try to refine hls, always flush video when reap segment.

@@ -309,12 +309,6 @@ int SrsHlsMuxer::flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab) @@ -309,12 +309,6 @@ int SrsHlsMuxer::flush_audio(SrsMpegtsFrame* af, SrsSimpleBuffer* ab)
309 { 309 {
310 int ret = ERROR_SUCCESS; 310 int ret = ERROR_SUCCESS;
311 311
312 - // if flushed yet, ignore.  
313 - if (ab->length() == 0) {  
314 - srs_info("ignore hls segment audio flushed yet.");  
315 - return ret;  
316 - }  
317 -  
318 // if current is NULL, segment is not open, ignore the flush event. 312 // if current is NULL, segment is not open, ignore the flush event.
319 if (!current) { 313 if (!current) {
320 srs_warn("flush audio ignored, for segment is not open."); 314 srs_warn("flush audio ignored, for segment is not open.");
@@ -342,12 +336,6 @@ int SrsHlsMuxer::flush_video(SrsMpegtsFrame* /*af*/, SrsSimpleBuffer* /*ab*/, Sr @@ -342,12 +336,6 @@ int SrsHlsMuxer::flush_video(SrsMpegtsFrame* /*af*/, SrsSimpleBuffer* /*ab*/, Sr
342 { 336 {
343 int ret = ERROR_SUCCESS; 337 int ret = ERROR_SUCCESS;
344 338
345 - // if flushed yet, ignore.  
346 - if (vb->length() == 0) {  
347 - srs_info("ignore hls segment video flushed yet.");  
348 - return ret;  
349 - }  
350 -  
351 // if current is NULL, segment is not open, ignore the flush event. 339 // if current is NULL, segment is not open, ignore the flush event.
352 if (!current) { 340 if (!current) {
353 srs_warn("flush video ignored, for segment is not open."); 341 srs_warn("flush video ignored, for segment is not open.");
@@ -762,6 +750,7 @@ int SrsHlsCache::write_video(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t @@ -762,6 +750,7 @@ int SrsHlsCache::write_video(SrsAvcAacCodec* codec, SrsHlsMuxer* muxer, int64_t
762 if ((ret = reap_segment("video", muxer, cache->vf->dts)) != ERROR_SUCCESS) { 750 if ((ret = reap_segment("video", muxer, cache->vf->dts)) != ERROR_SUCCESS) {
763 return ret; 751 return ret;
764 } 752 }
  753 + return ret;
765 } 754 }
766 755
767 // flush video when got one 756 // flush video when got one