diff --git a/ext-codec/AAC.cpp b/ext-codec/AAC.cpp index b6cc8a61..1a406c9b 100644 --- a/ext-codec/AAC.cpp +++ b/ext-codec/AAC.cpp @@ -396,6 +396,12 @@ Track::Ptr getTrackBySdp(const SdpTrack::Ptr &track) { // If aac config information cannot be obtained from sdp, then it cannot be obtained from rtp either, so ignore this Track return nullptr; } + while (aac_cfg_str.size() < 4) { + aac_cfg_str = '0' + aac_cfg_str; + } + if (aac_cfg_str.size() > 4) { + aac_cfg_str = aac_cfg_str.substr(0, 4); + } string aac_cfg; for (size_t i = 0; i < aac_cfg_str.size() / 2; ++i) { unsigned int cfg; diff --git a/src/Rtp/RtpSender.cpp b/src/Rtp/RtpSender.cpp index fb142862..3ae929e7 100644 --- a/src/Rtp/RtpSender.cpp +++ b/src/Rtp/RtpSender.cpp @@ -51,9 +51,9 @@ void RtpSender::startSend(const MediaSourceEvent &sender, const MediaSourceEvent // Do not recreate the object when reconnecting auto lam = [this](std::shared_ptr> list) { onFlushRtpList(std::move(list)); }; switch (args.data_type) { - case MediaSourceEvent::SendRtpArgs::kRtpPS: _interface = std::make_shared(lam, atoi(args.ssrc.data()), args.pt, true); break; - case MediaSourceEvent::SendRtpArgs::kRtpTS: _interface = std::make_shared(lam, atoi(args.ssrc.data()), args.pt, false); break; - case MediaSourceEvent::SendRtpArgs::kRtpES: _interface = std::make_shared(lam, atoi(args.ssrc.data()), args.pt, args.only_audio); break; + case MediaSourceEvent::SendRtpArgs::kRtpPS: _interface = std::make_shared(lam, stoll(args.ssrc), args.pt, true); break; + case MediaSourceEvent::SendRtpArgs::kRtpTS: _interface = std::make_shared(lam, stoll(args.ssrc), args.pt, false); break; + case MediaSourceEvent::SendRtpArgs::kRtpES: _interface = std::make_shared(lam, stoll(args.ssrc), args.pt, args.only_audio); break; default: CHECK(0, "invalid rtp type: " + to_string(args.data_type)); break; } } @@ -386,7 +386,7 @@ void RtpSender::onSendRtpUdp(const toolkit::Buffer::Ptr &buf, bool check) { _rtcp_send_ticker.resetTime(); // rtcp ssrcä¸ērtp ssrc + 1 [AUTO-TRANSLATED:318fada3] // rtcp ssrc is rtp ssrc + 1 - auto sr = _rtcp_context->createRtcpSR(atoi(_args.ssrc.data()) + 1); + auto sr = _rtcp_context->createRtcpSR(stoll(_args.ssrc) + 1); // send sender report rtcp _socket_rtcp->send(sr); }