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

完善获取flv是否包含音视频相关逻辑

Browse Source
This commit is contained in:
ziyue
2021-07-15 11:29:21 +08:00
parent fe42ea30fc
commit c8f00cefa0
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Rtmp/FlvMuxer.cpp
View File

@@ -67,7 +67,7 @@ BufferRaw::Ptr FlvMuxer::obtainBuffer(const void *data, size_t len) {
return buffer;
}
void FlvMuxer::onWriteFlvHeader(const RtmpMediaSource::Ptr &mediaSrc) {
void FlvMuxer::onWriteFlvHeader(const RtmpMediaSource::Ptr &src) {
//发送flv文件头
auto buffer = BufferRaw::create();
buffer->setCapacity(sizeof(FLVHeader));
@@ -80,15 +80,8 @@ void FlvMuxer::onWriteFlvHeader(const RtmpMediaSource::Ptr &mediaSrc) {
header->flv[2] = 'V';
header->version = 1;
header->length = htonl(9);
mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt) {
if (pkt->type_id == MSG_VIDEO) {
header->have_video = 1;
}
if (pkt->type_id == MSG_AUDIO) {
header->have_audio = 1;
}
});
header->have_video = src->haveVideo();
header->have_audio = src->haveAudio();
//flv header
onWrite(buffer, false);
@@ -97,7 +90,7 @@ void FlvMuxer::onWriteFlvHeader(const RtmpMediaSource::Ptr &mediaSrc) {
auto size = htonl(0);
onWrite(obtainBuffer((char *) &size, 4), false);
auto &metadata = mediaSrc->getMetaData();
auto &metadata = src->getMetaData();
if (metadata) {
//在有metadata的情况下才发送metadata
//其实metadata没什么用，有些推流器不产生metadata
@@ -107,7 +100,7 @@ void FlvMuxer::onWriteFlvHeader(const RtmpMediaSource::Ptr &mediaSrc) {
}
//config frame
mediaSrc->getConfigFrame([&](const RtmpPacket::Ptr &pkt) {
src->getConfigFrame([&](const RtmpPacket::Ptr &pkt) {
onWriteRtmp(pkt, true);
});
}