mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-24 18:47:50 +08:00
Compare commits
No commits in common. "be6f6a66905c54031b2bfb47bce0c732251b270a" and "493714bc7dcae61e5bb2d938b491726548763572" have entirely different histories.
be6f6a6690
...
493714bc7d
@ -82,9 +82,6 @@ API_EXPORT void API_CALL mk_stop_all_server(){
|
|||||||
#ifdef ENABLE_WEBRTC
|
#ifdef ENABLE_WEBRTC
|
||||||
rtcServer_udp = nullptr;
|
rtcServer_udp = nullptr;
|
||||||
rtcServer_tcp = nullptr;
|
rtcServer_tcp = nullptr;
|
||||||
iceServer_udp = nullptr;
|
|
||||||
iceServer_tcp = nullptr;
|
|
||||||
CLEAR_ARR(signaling_server);
|
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_SRT
|
#ifdef ENABLE_SRT
|
||||||
srtServer = nullptr;
|
srtServer = nullptr;
|
||||||
|
|||||||
@ -391,7 +391,7 @@ Track::Ptr getTrackBySdp(const SdpTrack::Ptr &track) {
|
|||||||
// If there is no sps/pps in the sdp, then it may be possible to recover the sps/pps in the subsequent rtp
|
// If there is no sps/pps in the sdp, then it may be possible to recover the sps/pps in the subsequent rtp
|
||||||
return std::make_shared<H264Track>();
|
return std::make_shared<H264Track>();
|
||||||
}
|
}
|
||||||
return std::make_shared<H264Track>(sps, pps, prefixSize(sps.data(), sps.size()), prefixSize(pps.data(), pps.size()));
|
return std::make_shared<H264Track>(sps, pps, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
RtpCodec::Ptr getRtpEncoderByCodecId(uint8_t pt) {
|
RtpCodec::Ptr getRtpEncoderByCodecId(uint8_t pt) {
|
||||||
|
|||||||
@ -392,10 +392,7 @@ Track::Ptr getTrackBySdp(const SdpTrack::Ptr &track) {
|
|||||||
// If there is no sps/pps in the sdp, then it may be possible to recover sps/pps from the subsequent rtp
|
// If there is no sps/pps in the sdp, then it may be possible to recover sps/pps from the subsequent rtp
|
||||||
return std::make_shared<H265Track>();
|
return std::make_shared<H265Track>();
|
||||||
}
|
}
|
||||||
return std::make_shared<H265Track>(vps, sps, pps,
|
return std::make_shared<H265Track>(vps, sps, pps, 0, 0, 0);
|
||||||
prefixSize(vps.data(), vps.size()),
|
|
||||||
prefixSize(sps.data(), sps.size()),
|
|
||||||
prefixSize(pps.data(), pps.size()));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
RtpCodec::Ptr getRtpEncoderByCodecId(uint8_t pt) {
|
RtpCodec::Ptr getRtpEncoderByCodecId(uint8_t pt) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user