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

更新media-server库

Browse Source
This commit is contained in:
xiongziliang 2019-12-12 22:25:55 +08:00
parent 2a518493d7
commit ee66d945e8
3 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdpart/media-server

@ -1 +1 @@
Subproject commit 4325386be318889b7815cdd86a2e83f05a059c81 Subproject commit 8d40dad3dbdce171756691d4511aca49fcf2a231

24
src/Extension/Factory.cpp
View File

@ -180,6 +180,9 @@ CodecId Factory::getCodecIdByAmf(const AMFValue &val){
if(str == "mp4a"){ if(str == "mp4a"){
return CodecAAC; return CodecAAC;
} }
if(str == "hev1" || str == "hvc1"){
return CodecH265;
}
WarnL << "暂不支持该Amf:" << str; WarnL << "暂不支持该Amf:" << str;
return CodecInvalid; return CodecInvalid;
} }
@ -187,12 +190,9 @@ CodecId Factory::getCodecIdByAmf(const AMFValue &val){
if (val.type() != AMF_NULL){ if (val.type() != AMF_NULL){
auto type_id = val.as_integer(); auto type_id = val.as_integer();
switch (type_id){ switch (type_id){
case 7:{ case 7: return CodecH264;
return CodecH264; case 10: return CodecAAC;
} case 12: return CodecH265;
case 10:{
return CodecAAC;
}
default: default:
WarnL << "暂不支持该Amf:" << type_id; WarnL << "暂不支持该Amf:" << type_id;
return CodecInvalid; return CodecInvalid;
@ -219,14 +219,10 @@ RtmpCodec::Ptr Factory::getRtmpCodecByTrack(const Track::Ptr &track) {
AMFValue Factory::getAmfByCodecId(CodecId codecId) { AMFValue Factory::getAmfByCodecId(CodecId codecId) {
switch (codecId){ switch (codecId){
case CodecAAC:{ case CodecAAC: return AMFValue("mp4a");
return AMFValue("mp4a"); case CodecH264: return AMFValue("avc1");
} case CodecH265: return AMFValue(12);
case CodecH264:{ default: return AMFValue(AMF_NULL);
return AMFValue("avc1");
}
default:
return AMFValue(AMF_NULL);
} }
} }

4
src/Record/MP4Muxer.cpp
View File

@ -152,7 +152,7 @@ void MP4Muxer::addTrack(const Track::Ptr &track) {
struct mpeg4_avc_t avc; struct mpeg4_avc_t avc;
string sps_pps = string("\x00\x00\x00\x01", 4) + h264_track->getSps() + string sps_pps = string("\x00\x00\x00\x01", 4) + h264_track->getSps() +
string("\x00\x00\x00\x01", 4) + h264_track->getPps(); string("\x00\x00\x00\x01", 4) + h264_track->getPps();
h264_annexbtomp4(&avc, sps_pps.data(), sps_pps.size(), NULL, 0, NULL); h264_annexbtomp4(&avc, sps_pps.data(), sps_pps.size(), NULL, 0, NULL, NULL);
uint8_t extra_data[1024]; uint8_t extra_data[1024];
int extra_data_size = mpeg4_avc_decoder_configuration_record_save(&avc, extra_data, sizeof(extra_data)); int extra_data_size = mpeg4_avc_decoder_configuration_record_save(&avc, extra_data, sizeof(extra_data));
@ -186,7 +186,7 @@ void MP4Muxer::addTrack(const Track::Ptr &track) {
string vps_sps_pps = string("\x00\x00\x00\x01", 4) + h265_track->getVps() + string vps_sps_pps = string("\x00\x00\x00\x01", 4) + h265_track->getVps() +
string("\x00\x00\x00\x01", 4) + h265_track->getSps() + string("\x00\x00\x00\x01", 4) + h265_track->getSps() +
string("\x00\x00\x00\x01", 4) + h265_track->getPps(); string("\x00\x00\x00\x01", 4) + h265_track->getPps();
h265_annexbtomp4(&hevc, vps_sps_pps.data(), vps_sps_pps.size(), NULL, 0, NULL); h265_annexbtomp4(&hevc, vps_sps_pps.data(), vps_sps_pps.size(), NULL, 0, NULL, NULL);
uint8_t extra_data[1024]; uint8_t extra_data[1024];
int extra_data_size = mpeg4_hevc_decoder_configuration_record_save(&hevc, extra_data, sizeof(extra_data)); int extra_data_size = mpeg4_hevc_decoder_configuration_record_save(&hevc, extra_data, sizeof(extra_data));