Merge branch 'master' of https://github.com/baiyfcu/ZLMediaKit

src/Common/Device.cpp

@@ -16,6 +16,7 @@
 #include "Util/base64.h"
 #include "Util/TimeTicker.h"
 #include "Extension/AAC.h"
+#include "Extension/G711.h"
 #include "Extension/H264.h"
 #include "Extension/H265.h"
 
@@ -148,6 +149,14 @@ void DevChannel::inputAAC(const char *pcDataWithoutAdts,int iDataLen, uint32_t u
 }
 
 
+void DevChannel::inputG711(const char* pcData, int iDataLen, uint32_t uiStamp)
+{
+    if (uiStamp == 0) {
+        uiStamp = (uint32_t)_aTicker[1].elapsedTime();
+    }
+    inputFrame(std::make_shared<G711FrameNoCacheAble>(_audio->codecId, (char*)pcData, iDataLen, uiStamp, 0));
+}
+
 void DevChannel::initVideo(const VideoInfo& info) {
     _video = std::make_shared<VideoInfo>(info);
     addTrack(std::make_shared<H264Track>());
@@ -159,32 +168,39 @@ void DevChannel::initH265Video(const VideoInfo &info){
 }
 
 void DevChannel::initAudio(const AudioInfo& info) {
-    _audio = std::make_shared<AudioInfo>(info);
-    addTrack(std::make_shared<AACTrack>());
+	_audio = std::make_shared<AudioInfo>(info);
+    if (info.codecId == CodecAAC)
+    {
+        addTrack(std::make_shared<AACTrack>());
 
-    AACFrame adtsHeader;
-    adtsHeader.syncword = 0x0FFF;
-    adtsHeader.id = 0;
-    adtsHeader.layer = 0;
-    adtsHeader.protection_absent = 1;
-    adtsHeader.profile =  info.iProfile;//audioObjectType - 1;
-    int i = 0;
-    for(auto rate : samplingFrequencyTable){
-        if(rate == info.iSampleRate){
-            adtsHeader.sf_index = i;
-        };
-        ++i;
+        AACFrame adtsHeader;
+        adtsHeader.syncword = 0x0FFF;
+        adtsHeader.id = 0;
+        adtsHeader.layer = 0;
+        adtsHeader.protection_absent = 1;
+        adtsHeader.profile = info.iProfile;//audioObjectType - 1;
+        int i = 0;
+        for (auto rate : samplingFrequencyTable) {
+            if (rate == info.iSampleRate) {
+                adtsHeader.sf_index = i;
+            };
+            ++i;
+        }
+        adtsHeader.private_bit = 0;
+        adtsHeader.channel_configuration = info.iChannel;
+        adtsHeader.original = 0;
+        adtsHeader.home = 0;
+        adtsHeader.copyright_identification_bit = 0;
+        adtsHeader.copyright_identification_start = 0;
+        adtsHeader.aac_frame_length = 7;
+        adtsHeader.adts_buffer_fullness = 2047;
+        adtsHeader.no_raw_data_blocks_in_frame = 0;
+        writeAdtsHeader(adtsHeader, _adtsHeader);
+    }
+    else if (info.codecId == CodecG711A || info.codecId == CodecG711U)
+    {
+        addTrack(std::make_shared<G711Track>(info.codecId, info.iSampleBit, info.iSampleRate));
     }
-    adtsHeader.private_bit = 0;
-    adtsHeader.channel_configuration = info.iChannel;
-    adtsHeader.original = 0;
-    adtsHeader.home = 0;
-    adtsHeader.copyright_identification_bit = 0;
-    adtsHeader.copyright_identification_start = 0;
-    adtsHeader.aac_frame_length = 7;
-    adtsHeader.adts_buffer_fullness = 2047;
-    adtsHeader.no_raw_data_blocks_in_frame = 0;
-    writeAdtsHeader(adtsHeader,_adtsHeader);
 }
 
 } /* namespace mediakit */

src/Common/Device.h

@@ -41,10 +41,11 @@ public:
 };
 class AudioInfo {
 public:
-    int iChannel;
-    int iSampleBit;
-    int iSampleRate;
-    int iProfile;
+    CodecId codecId;
+	int iChannel;
+	int iSampleBit;
+	int iSampleRate;
+	int iProfile;
 };
 
 /**
@@ -121,6 +122,13 @@ public:
      */
     void inputAAC(const char *pcDataWithoutAdts,int iDataLen, uint32_t uiStamp,const char *pcAdtsHeader);
 
+    /**
+     * G711音频帧
+     * @param pcData 音频帧
+     * @param iDataLen 帧数据长度
+     * @param uiStamp 时间戳，单位毫秒
+     */
+    void inputG711(const char* pcData, int iDataLen, uint32_t uiStamp);
 #ifdef ENABLE_X264
     /**
      * 输入yuv420p视频帧，内部会完成编码并调用inputH264方法

src/Common/MediaSink.cpp

@@ -35,6 +35,23 @@ void MediaSink::addTrack(const Track::Ptr &track_in) {
         if (_allTrackReady) {
             onTrackFrame(frame);
         }
+        else
+        {
+            if (frame->getTrackType() == TrackVideo)
+            {
+                checkTrackIfReady(nullptr);
+
+                if (_allTrackReady) {
+                    onTrackFrame(frame);
+                }
+                else
+                {
+                    ErrorL << " 还有track未准备好，丢帧 codecName: " << frame->getCodecName();
+                }
+
+            }else
+                ErrorL << " 还有track未准备好，丢帧 codecName: " << frame->getCodecName();
+        }
     }));
 }
 
@@ -116,6 +133,7 @@ void MediaSink::emitAllTrackReady() {
         return;
     }
 
+    DebugL << "all track ready use " << _ticker.elapsedTime() << "ms";
     if (!_trackReadyCallback.empty()) {
         //这是超时强制忽略未准备好的Track
         _trackReadyCallback.clear();