From 32ed957850ebbe68facebe53eb463a4dbffbf17c Mon Sep 17 00:00:00 2001 From: hankun Date: Fri, 14 Apr 2017 16:15:32 +0800 Subject: [PATCH] fixed bug: video rendering in hls stream generates only vertical parttern --- trunk/src/kernel/srs_kernel_ts.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 0b35808809..3aefb898da 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -3039,6 +3039,7 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample) video->payload->append((const char*)default_aud_nalu, 2); } + bool is_sps_pps_appended = false; // 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]; @@ -3056,7 +3057,7 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample) // 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 (nal_unit_type == SrsAvcNaluTypeIDR && !sample->has_sps_pps && !is_sps_pps_appended) { if (codec->sequenceParameterSetLength > 0) { srs_avc_insert_aud(video->payload, aud_inserted); video->payload->append(codec->sequenceParameterSetNALUnit, codec->sequenceParameterSetLength); @@ -3065,6 +3066,7 @@ int SrsTsCache::do_cache_avc(SrsAvcAacCodec* codec, SrsCodecSample* sample) srs_avc_insert_aud(video->payload, aud_inserted); video->payload->append(codec->pictureParameterSetNALUnit, codec->pictureParameterSetLength); } + is_sps_pps_appended = true; } // Insert the NALU to video in annexb.