Merge remote-tracking branch 'origin/master'

api/source/mk_media.cpp

@@ -187,7 +187,6 @@ API_EXPORT int API_CALL mk_media_init_video(mk_media ctx, int codec_id, int widt
     info.iWidth = width;
     info.iHeight = height;
     info.iBitRate = bit_rate;
-    (*obj)->getChannel()->initVideo(info);
     return (*obj)->getChannel()->initVideo(info);
 }
 

api/source/mk_track.cpp

@@ -10,12 +10,13 @@
 
 #include "mk_track.h"
 #include "Extension/Track.h"
+#include "Extension/Factory.h"
 
 using namespace std;
 using namespace toolkit;
 using namespace mediakit;
 
-class VideoTrackForC : public VideoTrack {
+class VideoTrackForC : public VideoTrack, public std::enable_shared_from_this<VideoTrackForC> {
 public:
     VideoTrackForC(int codec_id, codec_args *args) {
         _codec_id = (CodecId) codec_id;
@@ -49,7 +50,8 @@ public:
     }
 
     Track::Ptr clone() override {
-        return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this);
+        auto track_in = std::shared_ptr<Track>(shared_from_this());
+        return Factory::getTrackByAbstractTrack(track_in);
     }
 
     Sdp::Ptr getSdp() override {
@@ -61,7 +63,7 @@ private:
     codec_args _args;
 };
 
-class AudioTrackForC : public AudioTrackImp {
+class AudioTrackForC : public AudioTrackImp, public std::enable_shared_from_this<AudioTrackForC> {
 public:
     ~AudioTrackForC() override = default;
 
@@ -69,7 +71,8 @@ public:
         AudioTrackImp((CodecId) codec_id, args->audio.sample_rate, args->audio.channels, 16) {}
 
     Track::Ptr clone() override {
-        return std::make_shared<std::remove_reference<decltype(*this)>::type>(*this);
+        auto track_in = std::shared_ptr<Track>(shared_from_this());
+        return Factory::getTrackByAbstractTrack(track_in);
     }
 
     Sdp::Ptr getSdp() override {

api/tests/h264_media_server.c

@@ -64,8 +64,12 @@ int main(int argc, char *argv[]) {
 
     mk_media media = mk_media_create("__defaultVhost__", "live", "test", 0, 0, 0);
     //h264的codec
-    mk_media_init_video(media, 0, 0, 0, 0, 2 * 104 * 1024);
+    //mk_media_init_video(media, 0, 0, 0, 0, 2 * 104 * 1024);
+    codec_args v_args={0};
+    mk_track v_track = mk_track_create(MKCodecH264,&v_args);
+    mk_media_init_track(media,v_track);
     mk_media_init_complete(media);
+    mk_track_unref(v_track);
 
     //创建h264分帧器
     mk_h264_splitter splitter = mk_h264_splitter_create(on_h264_frame, media);

src/Extension/Factory.cpp

@@ -95,6 +95,32 @@ Track::Ptr Factory::getTrackBySdp(const SdpTrack::Ptr &track) {
     }
 }
 
+
+Track::Ptr Factory::getTrackByAbstractTrack(const Track::Ptr& track) {
+    auto codec = track->getCodecId();
+    switch (codec) {
+    case CodecG711A:
+    case CodecG711U: {
+        auto audio_track = dynamic_pointer_cast<AudioTrackImp>(track);
+        return std::make_shared<G711Track>(codec, audio_track->getAudioSampleRate(), audio_track->getAudioChannel(), 16);
+    }
+    case CodecL16: {
+        auto audio_track = dynamic_pointer_cast<AudioTrackImp>(track);
+        return std::make_shared<L16Track>(audio_track->getAudioSampleRate(), audio_track->getAudioChannel());
+    }
+    case CodecAAC  : return std::make_shared<AACTrack>();
+    case CodecOpus : return std::make_shared<OpusTrack>();
+    case CodecH265 : return std::make_shared<H265Track>();
+    case CodecH264 : return std::make_shared<H264Track>();
+
+    default: {
+        //其他codec不支持
+        WarnL << "暂不支持该该编码类型创建Track:" << track->getCodecName();
+        return nullptr;
+    }
+    }
+}
+
 RtpCodec::Ptr Factory::getRtpEncoderBySdp(const Sdp::Ptr &sdp) {
     GET_CONFIG(uint32_t,audio_mtu,Rtp::kAudioMtuSize);
     GET_CONFIG(uint32_t,video_mtu,Rtp::kVideoMtuSize);

src/Extension/Factory.h

@@ -28,6 +28,11 @@ public:
     static Track::Ptr getTrackBySdp(const SdpTrack::Ptr &track);
 
     /**
+     * 根据c api 抽象的Track生成具体Track对象
+     */
+    static Track::Ptr getTrackByAbstractTrack(const Track::Ptr& track);
+
+    /**
      * 根据sdp生成rtp编码器
      * @param sdp sdp对象
      */

webrtc/Sdp.cpp

@@ -771,7 +771,6 @@ void RtcSession::loadFrom(const string &str) {
     session_name = sdp.getSessionName();
     session_info = sdp.getSessionInfo();
     connection = sdp.getConnection();
-    bandwidth = sdp.getBandwidth();
     time = sdp.getSessionTime();
     msid_semantic = sdp.getItemClass<SdpAttrMsidSemantic>('a', "msid-semantic");
     for (auto &media : sdp.medias) {
@@ -783,6 +782,7 @@ void RtcSession::loadFrom(const string &str) {
         rtc_media.type = mline.type;
         rtc_media.port = mline.port;
         rtc_media.addr = media.getItemClass<SdpConnection>('c');
+        rtc_media.bandwidth = media.getItemClass<SdpBandwidth>('b');
         rtc_media.ice_ufrag = media.getStringItem('a', "ice-ufrag");
         rtc_media.ice_pwd = media.getStringItem('a', "ice-pwd");
         rtc_media.role = media.getItemClass<SdpAttrSetup>('a', "setup").role;
@@ -1060,9 +1060,6 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const{
     if(connection.empty()){
         sdp.addItem(std::make_shared<SdpConnection>(connection));
     }
-    if (!bandwidth.empty()) {
-        sdp.addItem(std::make_shared<SdpBandwidth>(bandwidth));
-    }
     sdp.addAttr(std::make_shared<SdpAttrGroup>(group));
     sdp.addAttr(std::make_shared<SdpAttrMsidSemantic>(msid_semantic));
     for (auto &m : media) {
@@ -1080,6 +1077,9 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const{
         }
         sdp_media.addItem(std::move(mline));
         sdp_media.addItem(std::make_shared<SdpConnection>(m.addr));
+        if (!m.bandwidth.empty() && m.type != TrackAudio) {
+            sdp_media.addItem(std::make_shared<SdpBandwidth>(m.bandwidth));
+        }
         if (!m.rtcp_addr.empty()) {
             sdp_media.addAttr(std::make_shared<SdpAttrRtcp>(m.rtcp_addr));
         }
@@ -1631,6 +1631,7 @@ RETRY:
         answer_media.proto = offer_media.proto;
         answer_media.port = offer_media.port;
         answer_media.addr = offer_media.addr;
+        answer_media.bandwidth = offer_media.bandwidth;
         answer_media.rtcp_addr = offer_media.rtcp_addr;
         answer_media.rtcp_mux = offer_media.rtcp_mux && configure.rtcp_mux;
         answer_media.rtcp_rsize = offer_media.rtcp_rsize && configure.rtcp_rsize;

webrtc/Sdp.h

@@ -612,6 +612,7 @@ public:
     std::string mid;
     uint16_t port{0};
     SdpConnection addr;
+    SdpBandwidth bandwidth;
     std::string proto;
     RtpDirection direction{RtpDirection::invalid};
     std::vector<RtcCodecPlan> plan;
@@ -666,7 +667,6 @@ public:
     std::string session_info;
     SdpTime time;
     SdpConnection connection;
-    SdpBandwidth bandwidth;
     SdpAttrMsidSemantic msid_semantic;
     std::vector<RtcMedia> media;
     SdpAttrGroup group;