amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-10-06 12:13:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

合并pr: #1391

Browse Source
This commit is contained in:
ziyue 2022-01-24 14:23:36 +08:00
parent 96061f1d36
commit bc583e80b5
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Extension/Factory.cpp
View File

@ -122,11 +122,12 @@ RtpCodec::Ptr Factory::getRtpEncoderBySdp(const Sdp::Ptr &sdp) {
case CodecL16 :
case CodecOpus : return std::make_shared<CommonRtpEncoder>(codec_id, ssrc, mtu, sample_rate, pt, interleaved);
case CodecG711A :
case CodecG711U :
if(pt == Rtsp::PT_PCMA || pt == Rtsp::PT_PCMU){
return std::make_shared<G711RtpEncoder>(codec_id, ssrc, mtu, sample_rate, pt, interleaved,1);
case CodecG711U : {
if (pt == Rtsp::PT_PCMA || pt == Rtsp::PT_PCMU) {
return std::make_shared<G711RtpEncoder>(codec_id, ssrc, mtu, sample_rate, pt, interleaved, 1);
}
return std::make_shared<CommonRtpEncoder>(codec_id, ssrc, mtu, sample_rate, pt, interleaved);
}
default : WarnL << "暂不支持该CodecId:" << codec_id; return nullptr;
}
}

40
src/Extension/G711Rtp.cpp
View File

@ -1,30 +1,34 @@
#include "G711Rtp.h"
G711RtpEncoder::G711RtpEncoder(CodecId codec, uint32_t ssrc, uint32_t mtu_size,
uint32_t sample_rate, uint8_t payload_type, uint8_t interleaved,uint32_t channels)
: CommonRtpDecoder(codec), RtpInfo(ssrc, mtu_size, sample_rate, payload_type, interleaved) {
_cache_frame = FrameImp::create();
_cache_frame->_codec_id = codec;
_channels = channels;
namespace mediakit {
G711RtpEncoder::G711RtpEncoder(
CodecId codec, uint32_t ssrc, uint32_t mtu_size, uint32_t sample_rate, uint8_t payload_type, uint8_t interleaved,
uint32_t channels)
: CommonRtpDecoder(codec)
, RtpInfo(ssrc, mtu_size, sample_rate, payload_type, interleaved) {
_cache_frame = FrameImp::create();
_cache_frame->_codec_id = codec;
_channels = channels;
}
bool G711RtpEncoder::inputFrame(const Frame::Ptr &frame){
auto dur = (_cache_frame->size()-_cache_frame->prefixSize())/(8*_channels);
auto next_pts = _cache_frame->pts()+dur;
if(next_pts == 0){
bool G711RtpEncoder::inputFrame(const Frame::Ptr &frame) {
auto dur = (_cache_frame->size() - _cache_frame->prefixSize()) / (8 * _channels);
auto next_pts = _cache_frame->pts() + dur;
if (next_pts == 0) {
_cache_frame->_pts = frame->pts();
}else{
if((next_pts+20) < frame->pts()){// 有丢包超过20ms
} else {
if ((next_pts + 20) < frame->pts()) { // 有丢包超过20ms
_cache_frame->_pts = frame->pts() - dur;
}
}
_cache_frame->_buffer.append(frame->data() + frame->prefixSize(),frame->size() - frame->prefixSize());
_cache_frame->_buffer.append(frame->data() + frame->prefixSize(), frame->size() - frame->prefixSize());
auto stamp = _cache_frame->pts();
auto ptr = _cache_frame->data() + _cache_frame->prefixSize();
auto len = _cache_frame->size() - _cache_frame->prefixSize();
auto remain_size = len;
auto max_size = 160*_channels; //20 ms per rtp
auto max_size = 160 * _channels; // 20 ms per rtp
int n = 0;
bool mark = false;
while (remain_size >= max_size) {
@ -40,7 +44,9 @@ bool G711RtpEncoder::inputFrame(const Frame::Ptr &frame){
ptr += rtp_size;
remain_size -= rtp_size;
}
_cache_frame->_buffer.erase(0,n*max_size);
_cache_frame->_pts += 20*n;
_cache_frame->_buffer.erase(0, n * max_size);
_cache_frame->_pts += 20 * n;
return len > 0;
}
}
} // namespace mediakit

13
src/Extension/G711Rtp.h
View File

@ -15,17 +15,16 @@
#include "CommonRtp.h"
#include "Rtsp/RtpCodec.h"
namespace mediakit{
namespace mediakit {
/**
* G711 rtp编码类
*/
class G711RtpEncoder : public CommonRtpDecoder, public RtpInfo {
public:
typedef std::shared_ptr <G711RtpEncoder> Ptr;
using Ptr = std::shared_ptr<G711RtpEncoder>;
~G711RtpEncoder() override {}
~G711RtpEncoder() override = default;
/**
* 构造函数
@ -36,15 +35,17 @@ public:
* @param payload_type pt类型
* @param interleaved rtsp interleaved 值
*/
G711RtpEncoder(CodecId codec, uint32_t ssrc, uint32_t mtu_size, uint32_t sample_rate, uint8_t payload_type, uint8_t interleaved,uint32_t channels);
G711RtpEncoder(CodecId codec, uint32_t ssrc, uint32_t mtu_size, uint32_t sample_rate, uint8_t payload_type,
uint8_t interleaved, uint32_t channels);
/**
* 输入帧数据并编码成rtp
*/
bool inputFrame(const Frame::Ptr &frame) override;
private:
FrameImp::Ptr _cache_frame;
uint32_t _channels = 1;
FrameImp::Ptr _cache_frame;
};
}//namespace mediakit