mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-14 20:15:58 +08:00
各协议全面支持vp8/vp9/av1编码,ertmp新增支持opus编码 (#4498)
实现功能: - rtp 增加vp8,vp9和av1编码支持 - 实现MP4录像所需的extra_data接口 - 扩展rtmp增加对opus、vp8、vp9和av1的支持 已知问题: - 开启enhance rtmp后,ffmpeg暂时不支持播放vp8编码格式,其他格式的支持 - vp9和av1开始播放时容易遇到卡顿情况,过几秒后好了,原因暂时未知 --------- Co-authored-by: xia-chu <771730766@qq.com>
This commit is contained in:
@@ -11,16 +11,32 @@
|
||||
#include "Opus.h"
|
||||
#include "Extension/Factory.h"
|
||||
#include "Extension/CommonRtp.h"
|
||||
#include "Extension/CommonRtmp.h"
|
||||
|
||||
#include "OpusRtmp.h"
|
||||
#include "opus-head.h"
|
||||
using namespace std;
|
||||
using namespace toolkit;
|
||||
|
||||
namespace mediakit {
|
||||
|
||||
void OpusTrack::setExtraData(const uint8_t *data, size_t size) {
|
||||
opus_head_t header;
|
||||
if (opus_head_load(data, size, &header) > 0) {
|
||||
// Successfully parsed Opus header
|
||||
_sample_rate = header.input_sample_rate;
|
||||
_channels = header.channels;
|
||||
}
|
||||
}
|
||||
|
||||
Sdp::Ptr OpusTrack::getSdp(uint8_t payload_type) const {
|
||||
return std::make_shared<DefaultSdp>(payload_type, *this);
|
||||
Buffer::Ptr OpusTrack::getExtraData() const {
|
||||
struct opus_head_t opus = { 0 };
|
||||
opus.version = 1;
|
||||
opus.channels = getAudioChannel();
|
||||
opus.input_sample_rate = getAudioSampleRate();
|
||||
// opus.pre_skip = 120;
|
||||
opus.channel_mapping_family = 0;
|
||||
auto ret = BufferRaw::create(29);
|
||||
ret->setSize(opus_head_save(&opus, (uint8_t *)ret->data(), ret->getCapacity()));
|
||||
return ret;
|
||||
}
|
||||
|
||||
namespace {
|
||||
@@ -46,11 +62,11 @@ RtpCodec::Ptr getRtpDecoderByCodecId() {
|
||||
}
|
||||
|
||||
RtmpCodec::Ptr getRtmpEncoderByTrack(const Track::Ptr &track) {
|
||||
return std::make_shared<CommonRtmpEncoder>(track);
|
||||
return std::make_shared<OpusRtmpEncoder>(track);
|
||||
}
|
||||
|
||||
RtmpCodec::Ptr getRtmpDecoderByTrack(const Track::Ptr &track) {
|
||||
return std::make_shared<CommonRtmpDecoder>(track);
|
||||
return std::make_shared<OpusRtmpDecoder>(track);
|
||||
}
|
||||
|
||||
Frame::Ptr getFrameFromPtr(const char *data, size_t bytes, uint64_t dts, uint64_t pts) {
|
||||
|
||||
Reference in New Issue
Block a user