去掉了aacpkg 为0的音频数据

lib/service/StreamH264Flv.py

@@ -312,19 +312,22 @@ class StreamH264Flv():
     def getAudioFrame(self,AVTag):
         frameData = {}
         frames = []
-        AVdata = AVTag[4:]
-        cp_id_bit = 0 << 27
-        cp_id_start = 0 << 26
-        aac_frame_length = int(len(AVdata) / 2 + 7) << 13
-        adts_buffer_funess = 2047 << 2
-        raw_data_frame = 0
-        infoAac = cp_id_bit + cp_id_start + aac_frame_length + adts_buffer_funess + raw_data_frame
-        infoAac = hex(infoAac)[2:]
-        while len(infoAac) < 7:
-            infoAac = "0" + infoAac
-        frame = "fff14c8" + infoAac + AVdata
-        frames.append(frame)
-        frameData["frames"] = frames
+        if AVTag[2:4] == "00":
+            frameData["frames"] = []
+        else:
+            AVdata = AVTag[4:]
+            cp_id_bit = 0 << 27
+            cp_id_start = 0 << 26
+            aac_frame_length = int(len(AVdata) / 2 + 7) << 13
+            adts_buffer_funess = 2047 << 2
+            raw_data_frame = 0
+            infoAac = cp_id_bit + cp_id_start + aac_frame_length + adts_buffer_funess + raw_data_frame
+            infoAac = hex(infoAac)[2:]
+            while len(infoAac) < 7:
+                infoAac = "0" + infoAac
+            frame = "fff14c8" + infoAac + AVdata
+            frames.append(frame)
+            frameData["frames"] = frames
         return frameData
 
     ####################################################
@@ -340,7 +343,7 @@ class StreamH264Flv():
 
 if __name__ == "__main__":
     obj = StreamH264Flv()
-    obj.setSendDur(0.001)
+    obj.setSendDur(0.007)
     obj.setIsSendAudio(1)
     # obj.setMobile("013146201117")
     obj.setMobile("142043390091")
@@ -348,7 +351,7 @@ if __name__ == "__main__":
     obj.setHost("10.100.11.125")
     # obj.setHost("video-test.vandyo.com")
     obj.setPort(1078)
-    obj.setVideoPath("../../flv/yyy.flv")
+    obj.setVideoPath("../../flv/bbb3.flv")
     obj.connectServer()
     obj.readFlvAndSend()
 

ui/CameraArea.py

@@ -304,10 +304,7 @@ class CameraArea():
         try:
             timeCur = self.getCurTime()
             if self.pushObj != None:
-                if self.getOsName() == "Windows":
-                    threadObj = threading.Thread(target=self.pushStream)
-                else:
-                    threadObj = threading.Thread(target=self.pushStream())
+                threadObj = threading.Thread(target=self.pushStream)
                 threadObj.start()
                 self.logTextCtr.WriteText(timeCur + "推流成功！\n")
                 self.pushStatusText.SetValue("推流中")

ui/MainWindow.py

@@ -38,6 +38,7 @@ class MainWindow():
 
         nodeBook = wx.Notebook(mainPanel)
         cameraArea1 = CameraArea(nodeBook)
+
         page1 = cameraArea1.create()
         nodeBook.AddPage(page1,"摄像头1")