addTrack/inputFrame接口支持返回值；新增全局添加静音音频接口

2026-06-19 06:42:21 +08:00 · 2021-09-27 13:12:53 +08:00
parent 1f99708548
commit e9008afca0
63 changed files with 447 additions and 357 deletions
--- a/src/Extension/AAC.cpp
+++ b/src/Extension/AAC.cpp
@@ -263,27 +263,31 @@ int AACTrack::getAudioChannel() const {
    return _channel;
 }

-void AACTrack::inputFrame(const Frame::Ptr &frame) {
-    if (frame->prefixSize()) {
-        //有adts头，尝试分帧
-        auto ptr = frame->data();
-        auto end = frame->data() + frame->size();
-        while (ptr < end) {
-            auto frame_len = getAacFrameLength((uint8_t *) ptr, end - ptr);
-            if (frame_len < ADTS_HEADER_LEN) {
-                break;
-            }
-            auto sub_frame = std::make_shared<FrameInternal<FrameFromPtr> >(frame, (char *) ptr, frame_len, ADTS_HEADER_LEN);
-            ptr += frame_len;
-            sub_frame->setCodecId(CodecAAC);
-            inputFrame_l(sub_frame);
-        }
-    } else {
-        inputFrame_l(frame);
+bool AACTrack::inputFrame(const Frame::Ptr &frame) {
+    if (!frame->prefixSize()) {
+        return inputFrame_l(frame);
    }
+
+    bool ret = false;
+    //有adts头，尝试分帧
+    auto ptr = frame->data();
+    auto end = frame->data() + frame->size();
+    while (ptr < end) {
+        auto frame_len = getAacFrameLength((uint8_t *) ptr, end - ptr);
+        if (frame_len < ADTS_HEADER_LEN) {
+            break;
+        }
+        auto sub_frame = std::make_shared<FrameInternal<FrameFromPtr> >(frame, (char *) ptr, frame_len, ADTS_HEADER_LEN);
+        ptr += frame_len;
+        sub_frame->setCodecId(CodecAAC);
+        if (inputFrame_l(sub_frame)) {
+            ret = true;
+        }
+    }
+    return ret;
 }

-void AACTrack::inputFrame_l(const Frame::Ptr &frame) {
+bool AACTrack::inputFrame_l(const Frame::Ptr &frame) {
    if (_cfg.empty()) {
        //未获取到aac_cfg信息
        if (frame->prefixSize()) {
@@ -297,8 +301,9 @@ void AACTrack::inputFrame_l(const Frame::Ptr &frame) {

    if (frame->size() > frame->prefixSize()) {
        //除adts头外，有实际负载
-        AudioTrack::inputFrame(frame);
+        return AudioTrack::inputFrame(frame);
    }
+    return false;
 }

 void AACTrack::onReady() {
--- a/src/Extension/AAC.h
+++ b/src/Extension/AAC.h
@@ -51,13 +51,13 @@ public:
    int getAudioChannel() const override;
    int getAudioSampleRate() const override;
    int getAudioSampleBit() const override;
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    void onReady();
    Sdp::Ptr getSdp() override;
    Track::Ptr clone() override;
-    void inputFrame_l(const Frame::Ptr &frame);
+    bool inputFrame_l(const Frame::Ptr &frame);

 private:
    string _cfg;
--- a/src/Extension/AACRtmp.cpp
+++ b/src/Extension/AACRtmp.cpp
@@ -85,7 +85,7 @@ void AACRtmpEncoder::makeConfigPacket() {
    }
 }

-void AACRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool AACRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
    if (_aac_cfg.empty()) {
        if (frame->prefixSize()) {
            //包含adts头,从adts头获取aac配置信息
@@ -94,23 +94,26 @@ void AACRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
        makeConfigPacket();
    }

-    if(!_aac_cfg.empty()){
-        auto rtmpPkt = RtmpPacket::create();
-        //header
-        uint8_t is_config = false;
-        rtmpPkt->buffer.push_back(_audio_flv_flags);
-        rtmpPkt->buffer.push_back(!is_config);
-
-        //aac data
-        rtmpPkt->buffer.append(frame->data() + frame->prefixSize(), frame->size() - frame->prefixSize());
-
-        rtmpPkt->body_size = rtmpPkt->buffer.size();
-        rtmpPkt->chunk_id = CHUNK_AUDIO;
-        rtmpPkt->stream_index = STREAM_MEDIA;
-        rtmpPkt->time_stamp = frame->dts();
-        rtmpPkt->type_id = MSG_AUDIO;
-        RtmpCodec::inputRtmp(rtmpPkt);
+    if(_aac_cfg.empty()){
+        return false;
    }
+
+    auto rtmpPkt = RtmpPacket::create();
+    //header
+    uint8_t is_config = false;
+    rtmpPkt->buffer.push_back(_audio_flv_flags);
+    rtmpPkt->buffer.push_back(!is_config);
+
+    //aac data
+    rtmpPkt->buffer.append(frame->data() + frame->prefixSize(), frame->size() - frame->prefixSize());
+
+    rtmpPkt->body_size = rtmpPkt->buffer.size();
+    rtmpPkt->chunk_id = CHUNK_AUDIO;
+    rtmpPkt->stream_index = STREAM_MEDIA;
+    rtmpPkt->time_stamp = frame->dts();
+    rtmpPkt->type_id = MSG_AUDIO;
+    RtmpCodec::inputRtmp(rtmpPkt);
+    return true;
 }

 void AACRtmpEncoder::makeAudioConfigPkt() {
--- a/src/Extension/AACRtmp.h
+++ b/src/Extension/AACRtmp.h
@@ -64,7 +64,7 @@ public:
     * 输入aac 数据，可以不带adts头
     * @param frame aac数据
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

    /**
     * 生成config包
--- a/src/Extension/AACRtp.cpp
+++ b/src/Extension/AACRtp.cpp
@@ -24,7 +24,7 @@ AACRtpEncoder::AACRtpEncoder(uint32_t ui32Ssrc,
                ui8Interleaved){
 }

-void AACRtpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool AACRtpEncoder::inputFrame(const Frame::Ptr &frame) {
    auto stamp = frame->dts();
    auto data = frame->data() + frame->prefixSize();
    auto len = frame->size() - frame->prefixSize();
@@ -50,6 +50,7 @@ void AACRtpEncoder::inputFrame(const Frame::Ptr &frame) {
        ptr += max_size;
        remain_size -= max_size;
    }
+    return len > 0;
 }

 void AACRtpEncoder::makeAACRtp(const void *data, size_t len, bool mark, uint32_t uiStamp) {
--- a/src/Extension/AACRtp.h
+++ b/src/Extension/AACRtp.h
@@ -74,7 +74,7 @@ public:
     * 输入aac 数据，必须带dats头
     * @param frame 带dats头的aac数据
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    void makeAACRtp(const void *pData, size_t uiLen, bool bMark, uint32_t uiStamp);
--- a/src/Extension/CommonRtmp.cpp
+++ b/src/Extension/CommonRtmp.cpp
@@ -42,9 +42,9 @@ CommonRtmpEncoder::CommonRtmpEncoder(const Track::Ptr &track) : CommonRtmpDecode
    _audio_flv_flags = getAudioRtmpFlags(track);
 }

-void CommonRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool CommonRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
    if (!_audio_flv_flags) {
-        return;
+        return false;
    }
    auto rtmp = RtmpPacket::create();
    //header
@@ -57,6 +57,7 @@ void CommonRtmpEncoder::inputFrame(const Frame::Ptr &frame) {
    rtmp->time_stamp = frame->dts();
    rtmp->type_id = MSG_AUDIO;
    RtmpCodec::inputRtmp(rtmp);
+    return true;
 }

 }//namespace mediakit
--- a/src/Extension/CommonRtmp.h
+++ b/src/Extension/CommonRtmp.h
@@ -63,7 +63,7 @@ public:
    /**
     * 输入帧数据
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    uint8_t _audio_flv_flags = 0;
--- a/src/Extension/CommonRtp.cpp
+++ b/src/Extension/CommonRtp.cpp
@@ -68,7 +68,7 @@ CommonRtpEncoder::CommonRtpEncoder(CodecId codec, uint32_t ssrc, uint32_t mtu_si
        : CommonRtpDecoder(codec), RtpInfo(ssrc, mtu_size, sample_rate, payload_type, interleaved) {
 }

-void CommonRtpEncoder::inputFrame(const Frame::Ptr &frame){
+bool CommonRtpEncoder::inputFrame(const Frame::Ptr &frame){
    auto stamp = frame->pts();
    auto ptr = frame->data() + frame->prefixSize();
    auto len = frame->size() - frame->prefixSize();
@@ -88,4 +88,5 @@ void CommonRtpEncoder::inputFrame(const Frame::Ptr &frame){
        ptr += rtp_size;
        remain_size -= rtp_size;
    }
+    return len > 0;
 }
--- a/src/Extension/CommonRtp.h
+++ b/src/Extension/CommonRtp.h
@@ -78,7 +78,7 @@ public:
    /**
     * 输入帧数据并编码成rtp
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;
 };

 }//namespace mediakit
--- a/src/Extension/Frame.cpp
+++ b/src/Extension/Frame.cpp
@@ -213,7 +213,7 @@ void FrameMerger::doMerge(BufferLikeString &merged, const Frame::Ptr &frame) con
    }
 }

-void FrameMerger::inputFrame(const Frame::Ptr &frame, const onOutput &cb, BufferLikeString *buffer) {
+bool FrameMerger::inputFrame(const Frame::Ptr &frame, const onOutput &cb, BufferLikeString *buffer) {
    if (willFlush(frame)) {
        Frame::Ptr back = _frame_cache.back();
        Buffer::Ptr merged_frame = back;
@@ -246,7 +246,7 @@ void FrameMerger::inputFrame(const Frame::Ptr &frame, const onOutput &cb, Buffer
        case mp4_nal_size: {
            if (frame->dropAble()) {
                //h264头和mp4头模式过滤无效的帧
-                return;
+                return false;
            }
            break;
        }
@@ -257,6 +257,7 @@ void FrameMerger::inputFrame(const Frame::Ptr &frame, const onOutput &cb, Buffer
        _have_decode_able_frame = true;
    }
    _frame_cache.emplace_back(Frame::getCacheAbleFrame(frame));
+    return true;
 }

 FrameMerger::FrameMerger(int type) {
--- a/src/Extension/Frame.h
+++ b/src/Extension/Frame.h
@@ -277,7 +277,7 @@ public:
    /**
     * 写入帧数据
     */
-    virtual void inputFrame(const Frame::Ptr &frame) = 0;
+    virtual bool inputFrame(const Frame::Ptr &frame) = 0;
 };

 /**
@@ -286,7 +286,7 @@ public:
 class FrameWriterInterfaceHelper : public FrameWriterInterface {
 public:
    typedef std::shared_ptr<FrameWriterInterfaceHelper> Ptr;
-    typedef std::function<void(const Frame::Ptr &frame)> onWriteFrame;
+    typedef std::function<bool(const Frame::Ptr &frame)> onWriteFrame;

    /**
     * inputFrame后触发onWriteFrame回调
@@ -300,9 +300,10 @@ public:
    /**
     * 写入帧数据
     */
-    void inputFrame(const Frame::Ptr &frame) override {
-        _writeCallback(frame);
+    bool inputFrame(const Frame::Ptr &frame) override {
+        return _writeCallback(frame);
    }
+
 private:
    onWriteFrame _writeCallback;
 };
@@ -340,7 +341,7 @@ public:
    /**
     * 写入帧并派发
     */
-    void inputFrame(const Frame::Ptr &frame) override{
+    bool inputFrame(const Frame::Ptr &frame) override{
        if(_need_update){
            //发现代理列表发生变化了，这里同步一次
            lock_guard<mutex> lck(_mtx);
@@ -349,9 +350,13 @@ public:
        }

        //_delegates_read能确保是单线程操作的
-        for(auto &pr : _delegates_read){
-            pr.second->inputFrame(frame);
+        bool ret = false;
+        for (auto &pr : _delegates_read) {
+            if (pr.second->inputFrame(frame)) {
+                ret = true;
+            }
        }
+        return ret;
    }

    /**
@@ -503,7 +508,7 @@ public:
    ~FrameMerger() = default;

    void clear();
-    void inputFrame(const Frame::Ptr &frame, const onOutput &cb, BufferLikeString *buffer = nullptr);
+    bool inputFrame(const Frame::Ptr &frame, const onOutput &cb, BufferLikeString *buffer = nullptr);

 private:
    bool willFlush(const Frame::Ptr &frame) const;
--- a/src/Extension/H264.cpp
+++ b/src/Extension/H264.cpp
@@ -144,18 +144,22 @@ bool H264Track::ready() {
    return !_sps.empty() && !_pps.empty();
 }

-void H264Track::inputFrame(const Frame::Ptr &frame) {
+bool H264Track::inputFrame(const Frame::Ptr &frame) {
    using H264FrameInternal = FrameInternal<H264FrameNoCacheAble>;
-    int type = H264_TYPE( frame->data()[frame->prefixSize()]);
-    if (type != H264Frame::NAL_B_P && type != H264Frame::NAL_IDR) {
-        //非I/B/P帧情况下，split一下，防止多个帧粘合在一起
-        splitH264(frame->data(), frame->size(), frame->prefixSize(), [&](const char *ptr, size_t len, size_t prefix) {
-            H264FrameInternal::Ptr sub_frame = std::make_shared<H264FrameInternal>(frame, (char *) ptr, len, prefix);
-            inputFrame_l(sub_frame);
-        });
-    } else {
-        inputFrame_l(frame);
+    int type = H264_TYPE(frame->data()[frame->prefixSize()]);
+    if (type == H264Frame::NAL_B_P || type == H264Frame::NAL_IDR) {
+        return inputFrame_l(frame);
    }
+
+    //非I/B/P帧情况下，split一下，防止多个帧粘合在一起
+    bool ret = false;
+    splitH264(frame->data(), frame->size(), frame->prefixSize(), [&](const char *ptr, size_t len, size_t prefix) {
+        H264FrameInternal::Ptr sub_frame = std::make_shared<H264FrameInternal>(frame, (char *) ptr, len, prefix);
+        if (inputFrame_l(sub_frame)) {
+            ret = true;
+        }
+    });
+    return ret;
 }

 void H264Track::onReady(){
@@ -169,8 +173,9 @@ Track::Ptr H264Track::clone() {
    return std::make_shared<std::remove_reference<decltype(*this)>::type >(*this);
 }

-void H264Track::inputFrame_l(const Frame::Ptr &frame){
+bool H264Track::inputFrame_l(const Frame::Ptr &frame){
    int type = H264_TYPE( frame->data()[frame->prefixSize()]);
+    bool ret = true;
    switch (type) {
        case H264Frame::NAL_SPS: {
            _sps = string(frame->data() + frame->prefixSize(), frame->size() - frame->prefixSize());
@@ -182,6 +187,7 @@ void H264Track::inputFrame_l(const Frame::Ptr &frame){
        }
        case H264Frame::NAL_AUD: {
            //忽略AUD帧;
+            ret = false;
            break;
        }

@@ -189,7 +195,7 @@ void H264Track::inputFrame_l(const Frame::Ptr &frame){
            if (frame->keyFrame()) {
                insertConfigFrame(frame);
            }
-            VideoTrack::inputFrame(frame);
+            ret = VideoTrack::inputFrame(frame);
            break;
    }

@@ -197,6 +203,7 @@ void H264Track::inputFrame_l(const Frame::Ptr &frame){
    if (_width == 0 && ready()) {
        onReady();
    }
+    return ret;
 }

 void H264Track::insertConfigFrame(const Frame::Ptr &frame){
--- a/src/Extension/H264.h
+++ b/src/Extension/H264.h
@@ -128,13 +128,13 @@ public:
    int getVideoHeight() const override;
    int getVideoWidth() const override;
    float getVideoFps() const override;
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    void onReady();
    Sdp::Ptr getSdp() override;
    Track::Ptr clone() override;
-    void inputFrame_l(const Frame::Ptr &frame);
+    bool inputFrame_l(const Frame::Ptr &frame);
    void insertConfigFrame(const Frame::Ptr &frame);

 private:
--- a/src/Extension/H264Rtmp.cpp
+++ b/src/Extension/H264Rtmp.cpp
@@ -155,7 +155,7 @@ void H264RtmpEncoder::makeConfigPacket(){
    }
 }

-void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
    auto data = frame->data() + frame->prefixSize();
    auto len = frame->size() - frame->prefixSize();
    auto type = H264_TYPE(data[0]);
@@ -183,7 +183,7 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
        _rtmp_packet->buffer.resize(5);
    }

-    _merger.inputFrame(frame, [this](uint32_t dts, uint32_t pts, const Buffer::Ptr &, bool have_key_frame) {
+    return _merger.inputFrame(frame, [this](uint32_t dts, uint32_t pts, const Buffer::Ptr &, bool have_key_frame) {
        //flags
        _rtmp_packet->buffer[0] = FLV_CODEC_H264 | ((have_key_frame ? FLV_KEY_FRAME : FLV_INTER_FRAME) << 4);
        //not config
--- a/src/Extension/H264Rtmp.h
+++ b/src/Extension/H264Rtmp.h
@@ -69,7 +69,7 @@ public:
     * 输入264帧，可以不带sps pps
     * @param frame 帧数据
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

    /**
     * 生成config包
--- a/src/Extension/H264Rtp.cpp
+++ b/src/Extension/H264Rtp.cpp
@@ -265,20 +265,20 @@ void H264RtpEncoder::packRtpStapA(const char *ptr, size_t len, uint32_t pts, boo
    RtpCodec::inputRtp(rtp, gop_pos);
 }

-void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
    auto ptr = frame->data() + frame->prefixSize();
    switch (H264_TYPE(ptr[0])) {
        case H264Frame::NAL_AUD:
        case H264Frame::NAL_SEI : {
-            return;
+            return false;
        }
        case H264Frame::NAL_SPS: {
            _sps = Frame::getCacheAbleFrame(frame);
-            return;
+            return true;
        }
        case H264Frame::NAL_PPS: {
            _pps = Frame::getCacheAbleFrame(frame);
-            return;
+            return true;
        }
        default: break;
    }
@@ -288,14 +288,16 @@ void H264RtpEncoder::inputFrame(const Frame::Ptr &frame) {
        inputFrame_l(_last_frame, _last_frame->pts() != frame->pts());
    }
    _last_frame = Frame::getCacheAbleFrame(frame);
+    return true;
 }

-void H264RtpEncoder::inputFrame_l(const Frame::Ptr &frame, bool is_mark){
+bool H264RtpEncoder::inputFrame_l(const Frame::Ptr &frame, bool is_mark){
    if (frame->keyFrame()) {
        //保证每一个关键帧前都有SPS与PPS
        insertConfigFrame(frame->pts());
    }
    packRtp(frame->data() + frame->prefixSize(), frame->size() - frame->prefixSize(), frame->pts(), is_mark, false);
+    return true;
 }

 }//namespace mediakit
--- a/src/Extension/H264Rtp.h
+++ b/src/Extension/H264Rtp.h
@@ -84,11 +84,11 @@ public:
     * 输入264帧
     * @param frame 帧数据，必须
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    void insertConfigFrame(uint32_t pts);
-    void inputFrame_l(const Frame::Ptr &frame, bool is_mark);
+    bool inputFrame_l(const Frame::Ptr &frame, bool is_mark);
    void packRtp(const char *data, size_t len, uint32_t pts, bool is_mark, bool gop_pos);
    void packRtpFu(const char *data, size_t len, uint32_t pts, bool is_mark, bool gop_pos);
    void packRtpStapA(const char *data, size_t len, uint32_t pts, bool is_mark, bool gop_pos);
--- a/src/Extension/H265.cpp
+++ b/src/Extension/H265.cpp
@@ -89,28 +89,32 @@ bool H265Track::ready() {
    return !_vps.empty() && !_sps.empty() && !_pps.empty();
 }

-void H265Track::inputFrame(const Frame::Ptr &frame) {
-    using H265FrameInternal = FrameInternal<H265FrameNoCacheAble>;
-    int type = H265_TYPE( frame->data()[frame->prefixSize()]);
-    if (frame->configFrame() || type == H265Frame::NAL_SEI_PREFIX) {
-        splitH264(frame->data(), frame->size(), frame->prefixSize(), [&](const char *ptr, size_t len, size_t prefix) {
-            H265FrameInternal::Ptr sub_frame = std::make_shared<H265FrameInternal>(frame, (char *) ptr, len, prefix);
-            inputFrame_l(sub_frame);
-        });
-    } else {
-        inputFrame_l(frame);
+bool H265Track::inputFrame(const Frame::Ptr &frame) {
+    int type = H265_TYPE(frame->data()[frame->prefixSize()]);
+    if (!frame->configFrame() && type != H265Frame::NAL_SEI_PREFIX) {
+        return inputFrame_l(frame);
    }
+    bool ret = false;
+    splitH264(frame->data(), frame->size(), frame->prefixSize(), [&](const char *ptr, size_t len, size_t prefix) {
+        using H265FrameInternal = FrameInternal<H265FrameNoCacheAble>;
+        H265FrameInternal::Ptr sub_frame = std::make_shared<H265FrameInternal>(frame, (char *) ptr, len, prefix);
+        if (inputFrame_l(sub_frame)) {
+            ret = true;
+        }
+    });
+    return ret;
 }

-void H265Track::inputFrame_l(const Frame::Ptr &frame) {
+bool H265Track::inputFrame_l(const Frame::Ptr &frame) {
    if (frame->keyFrame()) {
        insertConfigFrame(frame);
-        VideoTrack::inputFrame(frame);
        _is_idr = true;
-        return;
+        return VideoTrack::inputFrame(frame);
    }

    _is_idr = false;
+    bool ret = true;
+
    //非idr帧
    switch (H265_TYPE( frame->data()[frame->prefixSize()])) {
        case H265Frame::NAL_VPS: {
@@ -126,13 +130,14 @@ void H265Track::inputFrame_l(const Frame::Ptr &frame) {
            break;
        }
        default: {
-            VideoTrack::inputFrame(frame);
+            ret = VideoTrack::inputFrame(frame);
            break;
        }
    }
    if (_width == 0 && ready()) {
        onReady();
    }
+    return ret;
 }

 void H265Track::onReady() {
--- a/src/Extension/H265.h
+++ b/src/Extension/H265.h
@@ -150,13 +150,13 @@ public:
    int getVideoWidth() const override;
    int getVideoHeight() const override;
    float getVideoFps() const override;
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

 private:
    void onReady();
    Sdp::Ptr getSdp() override;
    Track::Ptr clone() override;
-    void inputFrame_l(const Frame::Ptr &frame);
+    bool inputFrame_l(const Frame::Ptr &frame);
    void insertConfigFrame(const Frame::Ptr &frame);

 private:
--- a/src/Extension/H265Rtmp.cpp
+++ b/src/Extension/H265Rtmp.cpp
@@ -134,7 +134,7 @@ void H265RtmpEncoder::makeConfigPacket(){
    }
 }

-void H265RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool H265RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
    auto data = frame->data() + frame->prefixSize();
    auto len = frame->size() - frame->prefixSize();
    auto type = H265_TYPE(data[0]);
@@ -169,7 +169,7 @@ void H265RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
        _rtmp_packet->buffer.resize(5);
    }

-    _merger.inputFrame(frame, [this](uint32_t dts, uint32_t pts, const Buffer::Ptr &, bool have_key_frame) {
+    return _merger.inputFrame(frame, [this](uint32_t dts, uint32_t pts, const Buffer::Ptr &, bool have_key_frame) {
        //flags
        _rtmp_packet->buffer[0] = FLV_CODEC_H265 | ((have_key_frame ? FLV_KEY_FRAME : FLV_INTER_FRAME) << 4);
        //not config
--- a/src/Extension/H265Rtmp.h
+++ b/src/Extension/H265Rtmp.h
@@ -67,7 +67,7 @@ public:
     * 输入265帧，可以不带sps pps
     * @param frame 帧数据
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;

    /**
     * 生成config包
--- a/src/Extension/H265Rtp.cpp
+++ b/src/Extension/H265Rtp.cpp
@@ -254,7 +254,7 @@ H265RtpEncoder::H265RtpEncoder(uint32_t ui32Ssrc,
                ui8Interleaved) {
 }

-void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
+bool H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
    auto ptr = (uint8_t *) frame->data() + frame->prefixSize();
    auto len = frame->size() - frame->prefixSize();
    auto pts = frame->pts();
@@ -305,6 +305,7 @@ void H265RtpEncoder::inputFrame(const Frame::Ptr &frame) {
    } else {
        RtpCodec::inputRtp(makeRtp(getTrackType(), ptr, len, false, pts), frame->keyFrame());
    }
+    return len > 0;
 }

 }//namespace mediakit
--- a/src/Extension/H265Rtp.h
+++ b/src/Extension/H265Rtp.h
@@ -86,7 +86,7 @@ public:
     * 输入265帧
     * @param frame 帧数据，必须
     */
-    void inputFrame(const Frame::Ptr &frame) override;
+    bool inputFrame(const Frame::Ptr &frame) override;
 };

 }//namespace mediakit{