Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-21 08:22:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

HLS切片间隔以数据时间戳为准:#463

Browse Source
This commit is contained in:
xiongziliang
2020-09-12 20:49:00 +08:00
parent 1b9550cfc4
commit 1e1b3794da
3 changed files with 65 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/Record/TsMuxer.cpp
View File

@@ -25,20 +25,20 @@ TsMuxer::~TsMuxer() {
}
void TsMuxer::stampSync(){
if(_codec_to_trackid.size() < 2){
if (_codec_to_trackid.size() < 2) {
return;
}
Stamp *audio = nullptr, *video = nullptr;
for(auto &pr : _codec_to_trackid){
switch (getTrackType((CodecId) pr.first)){
for (auto &pr : _codec_to_trackid) {
switch (getTrackType((CodecId) pr.first)) {
case TrackAudio : audio = &pr.second.stamp; break;
case TrackVideo : video = &pr.second.stamp; break;
default : break;
}
}
if(audio && video){
if (audio && video) {
//音频时间戳同步于视频，因为音频时间戳被修改后不影响播放
audio->syncTo(*video);
}
@@ -87,7 +87,7 @@ void TsMuxer::addTrack(const Track::Ptr &track) {
void TsMuxer::inputFrame(const Frame::Ptr &frame) {
auto it = _codec_to_trackid.find(frame->getCodecId());
if(it == _codec_to_trackid.end()){
if (it == _codec_to_trackid.end()) {
return;
}
auto &track_info = it->second;
@@ -95,39 +95,41 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
_is_idr_fast_packet = !_have_video;
switch (frame->getCodecId()){
case CodecH264: {
int type = H264_TYPE(*((uint8_t *)frame->data() + frame->prefixSize()));
if(type == H264Frame::NAL_SEI){
int type = H264_TYPE(*((uint8_t *) frame->data() + frame->prefixSize()));
if (type == H264Frame::NAL_SEI) {
break;
}
}
case CodecH265: {
//这里的代码逻辑是让SPS、PPS、IDR这些时间戳相同的帧打包到一起当做一个帧处理，
if (!_frameCached.empty() && _frameCached.back()->dts() != frame->dts()) {
Frame::Ptr back = _frameCached.back();
Buffer::Ptr merged_frame = back;
if(_frameCached.size() != 1){
if (_frameCached.size() != 1) {
string merged;
_frameCached.for_each([&](const Frame::Ptr &frame){
if(frame->prefixSize()){
merged.append(frame->data(),frame->size());
} else{
merged.append("\x00\x00\x00\x01",4);
merged.append(frame->data(),frame->size());
_frameCached.for_each([&](const Frame::Ptr &frame) {
if (frame->prefixSize()) {
merged.append(frame->data(), frame->size());
} else {
merged.append("\x00\x00\x00\x01", 4);
merged.append(frame->data(), frame->size());
}
if(frame->keyFrame()){
if (frame->keyFrame()) {
_is_idr_fast_packet = true;
}
});
merged_frame = std::make_shared<BufferString>(std::move(merged));
}
track_info.stamp.revise(back->dts(),back->pts(),dts_out,pts_out);
track_info.stamp.revise(back->dts(), back->pts(), dts_out, pts_out);
//取视频时间戳为TS的时间戳
_timestamp = dts_out;
mpeg_ts_write(_context, track_info.track_id, back->keyFrame() ? 0x0001 : 0, pts_out * 90LL, dts_out * 90LL, merged_frame->data(), merged_frame->size());
mpeg_ts_write(_context, track_info.track_id, back->keyFrame() ? 0x0001 : 0, pts_out * 90LL,dts_out * 90LL, merged_frame->data(), merged_frame->size());
_frameCached.clear();
}
_frameCached.emplace_back(Frame::getCacheAbleFrame(frame));
}
break;
}
case CodecAAC: {
if (frame->prefixSize() == 0) {
@@ -137,18 +139,21 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
}
default: {
track_info.stamp.revise(frame->dts(),frame->pts(),dts_out,pts_out);
_timestamp = dts_out;
track_info.stamp.revise(frame->dts(), frame->pts(), dts_out, pts_out);
if(!_have_video){
//没有视频时，才以音频时间戳为TS的时间戳
_timestamp = dts_out;
}
mpeg_ts_write(_context, track_info.track_id, frame->keyFrame() ? 0x0001 : 0, pts_out * 90LL, dts_out * 90LL, frame->data(), frame->size());
}
break;
}
}
}
void TsMuxer::resetTracks() {
_have_video = false;
//通知片段中断
onTs(nullptr, 0, 0, 0);
onTs(nullptr, 0, _timestamp, 0);
uninit();
init();
}
@@ -169,8 +174,8 @@ void TsMuxer::init() {
muxer->_is_idr_fast_packet = false;
}
};
if(_context == nullptr){
_context = mpeg_ts_create(&s_func,this);
if (_context == nullptr) {
_context = mpeg_ts_create(&s_func, this);
}
}