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

修正metadata拼写错误，优化RtmpMediaSource注册机制，修复及时拉流不出画面的bug

Browse Source
This commit is contained in:
xiongziliang
2019-09-23 16:47:20 +08:00
parent 8ae9f56110
commit cb7c72d9d9
14 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Rtmp/Rtmp.cpp
View File

@@ -27,35 +27,35 @@
#include "Extension/Factory.h"
namespace mediakit{
VideoMete::VideoMete(const VideoTrack::Ptr &video,int datarate ){
VideoMeta::VideoMeta(const VideoTrack::Ptr &video,int datarate ){
if(video->getVideoWidth() > 0 ){
_metedata.set("width", video->getVideoWidth());
_metadata.set("width", video->getVideoWidth());
}
if(video->getVideoHeight() > 0 ){
_metedata.set("height", video->getVideoHeight());
_metadata.set("height", video->getVideoHeight());
}
if(video->getVideoFps() > 0 ){
_metedata.set("framerate", video->getVideoFps());
_metadata.set("framerate", video->getVideoFps());
}
_metedata.set("videodatarate", datarate);
_metadata.set("videodatarate", datarate);
_codecId = video->getCodecId();
_metedata.set("videocodecid", Factory::getAmfByCodecId(_codecId));
_metadata.set("videocodecid", Factory::getAmfByCodecId(_codecId));
}
AudioMete::AudioMete(const AudioTrack::Ptr &audio,int datarate){
_metedata.set("audiodatarate", datarate);
AudioMeta::AudioMeta(const AudioTrack::Ptr &audio,int datarate){
_metadata.set("audiodatarate", datarate);
if(audio->getAudioSampleRate() > 0){
_metedata.set("audiosamplerate", audio->getAudioSampleRate());
_metadata.set("audiosamplerate", audio->getAudioSampleRate());
}
if(audio->getAudioSampleBit() > 0){
_metedata.set("audiosamplesize", audio->getAudioSampleBit());
_metadata.set("audiosamplesize", audio->getAudioSampleBit());
}
if(audio->getAudioChannel() > 0){
_metedata.set("audiochannels", audio->getAudioChannel());
_metedata.set("stereo", audio->getAudioChannel() > 1);
_metadata.set("audiochannels", audio->getAudioChannel());
_metadata.set("stereo", audio->getAudioChannel() > 1);
}
_codecId = audio->getCodecId();
_metedata.set("audiocodecid", Factory::getAmfByCodecId(_codecId));
_metadata.set("audiocodecid", Factory::getAmfByCodecId(_codecId));
}
}//namespace mediakit