From 03d951c0fbdf2fe0dcc8aefaadcc685115889ab5 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Sat, 30 May 2015 21:40:39 +0800
Subject: [PATCH] fix the audio or video pid generate bug.

---
 trunk/src/kernel/srs_kernel_ts.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp
index 64a7a1140..0f6baa666 100644
--- a/trunk/src/kernel/srs_kernel_ts.cpp
+++ b/trunk/src/kernel/srs_kernel_ts.cpp
@@ -771,17 +771,21 @@ SrsTsPacket* SrsTsPacket::create_pmt(SrsTsContext* context, int16_t pmt_number,
     pmt->last_section_number = 0;
     pmt->program_info_length = 0;
     
-    // if h.264 specified, use video to carry pcr.
-    if (vs == SrsTsStreamVideoH264) {
-        pmt->PCR_PID = vpid;
-        pmt->infos.push_back(new SrsTsPayloadPMTESInfo(vs, vpid));
-    } else if (as == SrsTsStreamAudioAAC || as == SrsTsStreamAudioMp3) {
+    // must got one valid codec.
+    srs_assert(vs == SrsTsStreamVideoH264 || as == SrsTsStreamAudioAAC || as == SrsTsStreamAudioMp3);
+    
+    // if mp3 or aac specified, use audio to carry pcr.
+    if (as == SrsTsStreamAudioAAC || as == SrsTsStreamAudioMp3) {
         // use audio to carray pcr by default.
         // for hls, there must be atleast one audio channel.
         pmt->PCR_PID = apid;
         pmt->infos.push_back(new SrsTsPayloadPMTESInfo(as, apid));
-    } else {
-        srs_assert(false);
+    }
+    
+    // if h.264 specified, use video to carry pcr.
+    if (vs == SrsTsStreamVideoH264) {
+        pmt->PCR_PID = vpid;
+        pmt->infos.push_back(new SrsTsPayloadPMTESInfo(vs, vpid));
     }
     
     pmt->CRC_32 = 0; // calc in encode.