MPEG: 整合复用ts/ps生成代码

src/Rtp/PSEncoder.cpp

@@ -9,148 +9,14 @@
  */
 
 #if defined(ENABLE_RTPPROXY)
+
 #include "PSEncoder.h"
 #include "Extension/H264.h"
 #include "Rtsp/RtspMuxer.h"
+
 namespace mediakit{
 
-PSEncoder::PSEncoder() {
-    _buffer = BufferRaw::create();
-    init();
-}
-
-PSEncoder::~PSEncoder() {
-
-}
-
-void PSEncoder::init() {
-    static struct ps_muxer_func_t func = {
-            /*alloc*/
-            [](void *param, size_t bytes) {
-                PSEncoder *thiz = (PSEncoder *) param;
-                thiz->_buffer->setCapacity(bytes + 1);
-                return (void *) thiz->_buffer->data();
-            },
-            /*free*/
-            [](void *param, void *packet) {
-                //什么也不做
-            },
-            /*wtite*/
-            [](void *param, int stream, void *packet, size_t bytes) {
-                PSEncoder *thiz = (PSEncoder *) param;
-                thiz->onPS(thiz->_timestamp, packet, bytes);
-                return 0;
-            }
-    };
-
-    _muxer.reset(ps_muxer_create(&func, this), [](struct ps_muxer_t *ptr) {
-        ps_muxer_destroy(ptr);
-    });
-}
-
-bool PSEncoder::addTrack(const Track::Ptr &track) {
-    switch (track->getCodecId()) {
-        case CodecH264: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_VIDEO_H264, nullptr, 0);
-            break;
-        }
-
-        case CodecH265: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_VIDEO_H265, nullptr, 0);
-            break;
-        }
-
-        case CodecAAC: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_AUDIO_AAC, nullptr, 0);
-            break;
-        }
-
-        case CodecG711A: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_AUDIO_G711A, nullptr, 0);
-            break;
-        }
-
-        case CodecG711U: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_AUDIO_G711U, nullptr, 0);
-            break;
-        }
-
-        case CodecOpus: {
-            _codec_to_trackid[track->getCodecId()].track_id = ps_muxer_add_stream(_muxer.get(), STREAM_AUDIO_OPUS, nullptr, 0);
-            break;
-        }
-
-        default: WarnL << "mpeg-ps 不支持该编码格式,已忽略:" << track->getCodecName(); return false;
-    }
-    //尝试音视频同步
-    stampSync();
-    return true;
-}
-
-void PSEncoder::stampSync(){
-    if(_codec_to_trackid.size() < 2){
-        return;
-    }
-
-    Stamp *audio = nullptr, *video = nullptr;
-    for(auto &pr : _codec_to_trackid){
-        switch (getTrackType((CodecId) pr.first)){
-            case TrackAudio : audio = &pr.second.stamp; break;
-            case TrackVideo : video = &pr.second.stamp; break;
-            default : break;
-        }
-    }
-
-    if(audio && video){
-        //音频时间戳同步于视频，因为音频时间戳被修改后不影响播放
-        audio->syncTo(*video);
-    }
-}
-
-void PSEncoder::resetTracks() {
-    init();
-}
-
-bool PSEncoder::inputFrame(const Frame::Ptr &frame) {
-    auto it = _codec_to_trackid.find(frame->getCodecId());
-    if (it == _codec_to_trackid.end()) {
-        return false;
-    }
-    auto &track_info = it->second;
-    int64_t dts_out, pts_out;
-    switch (frame->getCodecId()) {
-        case CodecH264:
-        case CodecH265: {
-            //这里的代码逻辑是让SPS、PPS、IDR这些时间戳相同的帧打包到一起当做一个帧处理，
-            return _frame_merger.inputFrame(frame, [&](uint32_t dts, uint32_t pts, const Buffer::Ptr &buffer, bool have_idr) {
-                track_info.stamp.revise(dts, pts, dts_out, pts_out);
-                //取视频时间戳为TS的时间戳
-                _timestamp = (uint32_t) pts_out;
-                ps_muxer_input(_muxer.get(), track_info.track_id, have_idr ? 0x0001 : 0,
-                               pts_out * 90LL, dts_out * 90LL, buffer->data(), buffer->size());
-            });
-        }
-
-        case CodecAAC: {
-            if (frame->prefixSize() == 0) {
-                WarnL << "必须提供adts头才能mpeg-ps打包";
-                return false;
-            }
-        }
-
-        default: {
-            track_info.stamp.revise(frame->dts(), frame->pts(), dts_out, pts_out);
-            _timestamp = (uint32_t) dts_out;
-            ps_muxer_input(_muxer.get(), track_info.track_id, frame->keyFrame() ? 0x0001 : 0, pts_out * 90LL,
-                           dts_out * 90LL, frame->data(), frame->size());
-            return true;
-        }
-    }
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-PSEncoderImp::PSEncoderImp(uint32_t ssrc, uint8_t payload_type) {
+PSEncoderImp::PSEncoderImp(uint32_t ssrc, uint8_t payload_type) : MpegMuxer(true) {
     GET_CONFIG(uint32_t,video_mtu,Rtp::kVideoMtuSize);
     _rtp_encoder = std::make_shared<CommonRtpEncoder>(CodecInvalid, ssrc, video_mtu, 90000, payload_type, 0);
     _rtp_encoder->setRtpRing(std::make_shared<RtpRing::RingType>());
@@ -164,9 +30,13 @@ PSEncoderImp::~PSEncoderImp() {
     InfoL << this << " " << printSSRC(_rtp_encoder->getSsrc());
 }
 
-void PSEncoderImp::onPS(uint32_t stamp, void *packet, size_t bytes) {
-    _rtp_encoder->inputFrame(std::make_shared<FrameFromPtr>((char *) packet, bytes, stamp, stamp));
+void PSEncoderImp::onWrite(std::shared_ptr<Buffer> buffer, uint32_t stamp, bool key_pos) {
+    if (!buffer) {
+        return;
+    }
+    _rtp_encoder->inputFrame(std::make_shared<FrameFromPtr>(buffer->data(), buffer->size(), stamp, stamp));
 }
 
 }//namespace mediakit
+
 #endif//defined(ENABLE_RTPPROXY)