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

适配flash player

Browse Source
This commit is contained in:
xiongziliang
2017-05-13 17:25:31 +08:00
parent c0477c897e
commit acc6106f6e
7 changed files with 75 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Rtsp/RtspToRtmpMediaSource.cpp
View File

@@ -75,7 +75,7 @@ void RtspToRtmpMediaSource::onGetH264(const H264Frame& frame) {
m_rtmpPkt.strBuf.append(&frame.data[4], frame.data.size() - 4);
m_rtmpPkt.bodySize = m_rtmpPkt.strBuf.size();
m_rtmpPkt.chunkId = CHUNK_CLIENT_REQUEST_AFTER;
m_rtmpPkt.chunkId = CHUNK_MEDIA;
m_rtmpPkt.streamId = STREAM_MEDIA;
m_rtmpPkt.timeStamp = frame.timeStamp;
m_rtmpPkt.typeId = MSG_VIDEO;
@@ -115,7 +115,7 @@ void RtspToRtmpMediaSource::makeVideoConfigPkt() {
m_rtmpPkt.strBuf.append(m_pps);
m_rtmpPkt.bodySize = m_rtmpPkt.strBuf.size();
m_rtmpPkt.chunkId = CHUNK_CLIENT_REQUEST_AFTER;
m_rtmpPkt.chunkId = CHUNK_MEDIA;
m_rtmpPkt.streamId = STREAM_MEDIA;
m_rtmpPkt.timeStamp = 0;
m_rtmpPkt.typeId = MSG_VIDEO;
@@ -135,7 +135,7 @@ void RtspToRtmpMediaSource::onGetAdts(const AdtsFrame& frame) {
m_rtmpPkt.strBuf.append((char *) frame.data + 7, frame.aac_frame_length - 7);
m_rtmpPkt.bodySize = m_rtmpPkt.strBuf.size();
m_rtmpPkt.chunkId = CHUNK_CLIENT_REQUEST_AFTER;
m_rtmpPkt.chunkId = CHUNK_MEDIA;
m_rtmpPkt.streamId = STREAM_MEDIA;
m_rtmpPkt.timeStamp = frame.timeStamp;
m_rtmpPkt.typeId = MSG_AUDIO;
@@ -175,7 +175,7 @@ void RtspToRtmpMediaSource::makeAudioConfigPkt() {
m_rtmpPkt.strBuf.append(m_pParser->getAudioCfg());
m_rtmpPkt.bodySize = m_rtmpPkt.strBuf.size();
m_rtmpPkt.chunkId = CHUNK_CLIENT_REQUEST_AFTER;
m_rtmpPkt.chunkId = CHUNK_MEDIA;
m_rtmpPkt.streamId = STREAM_MEDIA;
m_rtmpPkt.timeStamp = 0;
m_rtmpPkt.typeId = MSG_AUDIO;
@@ -186,7 +186,7 @@ void RtspToRtmpMediaSource::makeMetaData() {
m_pRtmpSrc.reset(new RtmpMediaSource(getApp(),getId()));
m_pRtmpSrc->setOnSeek(m_onSeek);
m_pRtmpSrc->setOnStamp(m_onStamp);
AMFValue metaData(AMF_ECMA_ARRAY);
AMFValue metaData(AMF_OBJECT);
metaData.set("duration", m_pParser->getDuration());
metaData.set("fileSize", 0);
if (m_pParser->containVideo()) {