amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复生成rtmp包时间戳错误的问题

Browse Source
This commit is contained in:
ziyue 2021-08-19 19:52:55 +08:00
parent 1cddc2227b
commit 94a6dc66c9
3 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/ZLToolKit

@ -1 +1 @@
Subproject commit 935ae9406bc5569e916dba604ec3ce5f6cf84bcf Subproject commit 6214f5028763c5245d79d4c6c9d50bc780c8d6b7

32
src/Extension/H264Rtmp.cpp
View File

@ -8,6 +8,7 @@
* may be found in the AUTHORS file in the root of the source tree. * may be found in the AUTHORS file in the root of the source tree.
*/ */
#include "Rtmp/utils.h"
#include "H264Rtmp.h" #include "H264Rtmp.h"
namespace mediakit{ namespace mediakit{
@ -177,30 +178,29 @@ void H264RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
} }
if (!_rtmp_packet) { if (!_rtmp_packet) {
//I or P or B frame
int8_t flags = FLV_CODEC_H264;
bool is_config = false;
flags |= (((frame->configFrame() || frame->keyFrame()) ? FLV_KEY_FRAME : FLV_INTER_FRAME) << 4);
_rtmp_packet = RtmpPacket::create(); _rtmp_packet = RtmpPacket::create();
_rtmp_packet->buffer.clear(); //flags/not config/cts预占位
_rtmp_packet->buffer.push_back(flags); _rtmp_packet->buffer.resize(5);
_rtmp_packet->buffer.push_back(!is_config); }
int32_t cts = frame->pts() - frame->dts();
_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
_rtmp_packet->buffer[1] = true;
int32_t cts = pts - dts;
if (cts < 0) { if (cts < 0) {
cts = 0; cts = 0;
} }
cts = htonl(cts); //cts
_rtmp_packet->buffer.append((char *) &cts + 1, 3); set_be24(&_rtmp_packet->buffer[2], cts);
_rtmp_packet->time_stamp = dts;
_rtmp_packet->body_size = _rtmp_packet->buffer.size();
_rtmp_packet->chunk_id = CHUNK_VIDEO; _rtmp_packet->chunk_id = CHUNK_VIDEO;
_rtmp_packet->stream_index = STREAM_MEDIA; _rtmp_packet->stream_index = STREAM_MEDIA;
_rtmp_packet->time_stamp = frame->dts();
_rtmp_packet->type_id = MSG_VIDEO; _rtmp_packet->type_id = MSG_VIDEO;
}
_merger.inputFrame(frame, [&](uint32_t, uint32_t, const Buffer::Ptr &, bool) {
//输出rtmp packet //输出rtmp packet
_rtmp_packet->body_size = _rtmp_packet->buffer.size();
RtmpCodec::inputRtmp(_rtmp_packet); RtmpCodec::inputRtmp(_rtmp_packet);
_rtmp_packet = nullptr; _rtmp_packet = nullptr;
}, &_rtmp_packet->buffer); }, &_rtmp_packet->buffer);

33
src/Extension/H265Rtmp.cpp
View File

@ -8,6 +8,7 @@
* may be found in the AUTHORS file in the root of the source tree. * may be found in the AUTHORS file in the root of the source tree.
*/ */
#include "Rtmp/utils.h"
#include "H265Rtmp.h" #include "H265Rtmp.h"
#ifdef ENABLE_MP4 #ifdef ENABLE_MP4
#include "mpeg4-hevc.h" #include "mpeg4-hevc.h"
@ -163,32 +164,32 @@ void H265RtmpEncoder::inputFrame(const Frame::Ptr &frame) {
} }
if (!_rtmp_packet) { if (!_rtmp_packet) {
//I or P or B frame
int8_t flags = FLV_CODEC_H265;
bool is_config = false;
flags |= (((frame->configFrame() || frame->keyFrame()) ? FLV_KEY_FRAME : FLV_INTER_FRAME) << 4);
_rtmp_packet = RtmpPacket::create(); _rtmp_packet = RtmpPacket::create();
_rtmp_packet->buffer.clear(); //flags/not_config/cts预占位
_rtmp_packet->buffer.push_back(flags); _rtmp_packet->buffer.resize(5);
_rtmp_packet->buffer.push_back(!is_config); }
int32_t cts = frame->pts() - frame->dts();
_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
_rtmp_packet->buffer[1] = true;
int32_t cts = pts - dts;
if (cts < 0) { if (cts < 0) {
cts = 0; cts = 0;
} }
cts = htonl(cts); //cts
_rtmp_packet->buffer.append((char *) &cts + 1, 3); set_be24(&_rtmp_packet->buffer[2], cts);
_rtmp_packet->time_stamp = dts;
_rtmp_packet->body_size = _rtmp_packet->buffer.size();
_rtmp_packet->chunk_id = CHUNK_VIDEO; _rtmp_packet->chunk_id = CHUNK_VIDEO;
_rtmp_packet->stream_index = STREAM_MEDIA; _rtmp_packet->stream_index = STREAM_MEDIA;
_rtmp_packet->time_stamp = frame->dts();
_rtmp_packet->type_id = MSG_VIDEO; _rtmp_packet->type_id = MSG_VIDEO;
}
_merger.inputFrame(frame, [&](uint32_t, uint32_t, const Buffer::Ptr &, bool) {
//输出rtmp packet //输出rtmp packet
_rtmp_packet->body_size = _rtmp_packet->buffer.size();
RtmpCodec::inputRtmp(_rtmp_packet); RtmpCodec::inputRtmp(_rtmp_packet);
_rtmp_packet = nullptr; _rtmp_packet = nullptr;
}, &_rtmp_packet->buffer); }, &_rtmp_packet->buffer);
} }
void H265RtmpEncoder::makeVideoConfigPkt() { void H265RtmpEncoder::makeVideoConfigPkt() {