mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-14 12:05: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:
@@ -10,23 +10,43 @@
|
||||
|
||||
#include "AV1.h"
|
||||
#include "AV1Rtp.h"
|
||||
#include "VpxRtmp.h"
|
||||
#include "Extension/Factory.h"
|
||||
#include "Extension/CommonRtp.h"
|
||||
#include "Extension/CommonRtmp.h"
|
||||
|
||||
using namespace std;
|
||||
using namespace toolkit;
|
||||
|
||||
namespace mediakit {
|
||||
|
||||
Sdp::Ptr AV1Track::getSdp(uint8_t payload_type) const {
|
||||
return std::make_shared<DefaultSdp>(payload_type, *this);
|
||||
bool AV1Track::inputFrame(const Frame::Ptr &frame) {
|
||||
char *dataPtr = frame->data() + frame->prefixSize();
|
||||
if (0 == aom_av1_codec_configuration_record_init(&_context, dataPtr, frame->size() - frame->prefixSize())) {
|
||||
_width = _context.width;
|
||||
_height = _context.height;
|
||||
//InfoL << _width << "x" << _height;
|
||||
}
|
||||
return VideoTrackImp::inputFrame(frame);
|
||||
}
|
||||
|
||||
Track::Ptr AV1Track::clone() const {
|
||||
return std::make_shared<AV1Track>(*this);
|
||||
}
|
||||
|
||||
Buffer::Ptr AV1Track::getExtraData() const {
|
||||
if (_context.bytes <= 0)
|
||||
return nullptr;
|
||||
auto ret = BufferRaw::create(4 + _context.bytes);
|
||||
ret->setSize(aom_av1_codec_configuration_record_save(&_context, (uint8_t *)ret->data(), ret->getCapacity()));
|
||||
return ret;
|
||||
}
|
||||
|
||||
void AV1Track::setExtraData(const uint8_t *data, size_t size) {
|
||||
if (aom_av1_codec_configuration_record_load(data, size, &_context) > 0) {
|
||||
_width = _context.width;
|
||||
_height = _context.height;
|
||||
}
|
||||
}
|
||||
|
||||
namespace {
|
||||
|
||||
CodecId getCodec() {
|
||||
@@ -34,8 +54,7 @@ CodecId getCodec() {
|
||||
}
|
||||
|
||||
Track::Ptr getTrackByCodecId(int sample_rate, int channels, int sample_bit) {
|
||||
// AV1是视频编解码器,这里的参数实际上是width, height, fps
|
||||
return std::make_shared<AV1Track>(sample_rate, channels, sample_bit);
|
||||
return std::make_shared<AV1Track>();
|
||||
}
|
||||
|
||||
Track::Ptr getTrackBySdp(const SdpTrack::Ptr &track) {
|
||||
@@ -51,15 +70,15 @@ RtpCodec::Ptr getRtpDecoderByCodecId() {
|
||||
}
|
||||
|
||||
RtmpCodec::Ptr getRtmpEncoderByTrack(const Track::Ptr &track) {
|
||||
return std::make_shared<CommonRtmpEncoder>(track);
|
||||
return std::make_shared<VpxRtmpEncoder>(track);
|
||||
}
|
||||
|
||||
RtmpCodec::Ptr getRtmpDecoderByTrack(const Track::Ptr &track) {
|
||||
return std::make_shared<CommonRtmpDecoder>(track);
|
||||
return std::make_shared<VpxRtmpDecoder>(track);
|
||||
}
|
||||
|
||||
Frame::Ptr getFrameFromPtr(const char *data, size_t bytes, uint64_t dts, uint64_t pts) {
|
||||
return std::make_shared<FrameFromPtr>(CodecAV1, (char *)data, bytes, dts, pts);
|
||||
return std::make_shared<AV1FrameNoCacheAble>((char *)data, bytes, dts, pts, 0);
|
||||
}
|
||||
|
||||
} // namespace
|
||||
@@ -73,4 +92,4 @@ CodecPlugin av1_plugin = { getCodec,
|
||||
getRtmpDecoderByTrack,
|
||||
getFrameFromPtr };
|
||||
|
||||
}//namespace mediakit
|
||||
} // namespace mediakit
|
||||
Reference in New Issue
Block a user