Merge 6119ac9c53 into 351e8fbd43

Fixed the compilation issue on macOS15 M platform
https://github.com/ZLMediaKit/ZLToolKit/pull/252
2024-11-24 11:40:37 +08:00 · 2024-10-11 16:24:38 +08:00 · 2024-10-11 14:23:05 +08:00 · 2024-03-28 11:21:23 +08:00 · 2024-03-28 11:15:19 +08:00 · 2024-02-19 11:20:06 +08:00
2 changed files with 11 additions and 1 deletions
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@ -1 +1 @@
-Subproject commit f8add834ea352bd8c9279486e48ae5070a84d4aa
+Subproject commit 46231014e2a7ec1903d4a37e96222481ecc779d8
--- a/src/Rtp/GB28181Process.cpp
+++ b/src/Rtp/GB28181Process.cpp
@ -105,6 +105,16 @@ bool GB28181Process::inputRtp(bool, const char *data, size_t data_len) {
                _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
                break;
            }
+            case Rtsp::PT_L16_Mono: {
+                //L16
+                ref = std::make_shared<RtpReceiverImp>(16000, [this](RtpPacket::Ptr rtp) { onRtpSorted(std::move(rtp)); });
+                auto track = Factory::getTrackByCodecId(CodecL16, 16000, 1, 16);
+                CHECK(track);
+                track->setIndex(pt);
+                _interface->addTrack(track);
+                _rtp_decoder[pt] = Factory::getRtpDecoderByCodecId(track->getCodecId());
+                break;
+            }
            default: {
                if (pt == opus_pt) {
                    // opus负载  [AUTO-TRANSLATED:defa6a8d]
Author	SHA1	Message	Date
imp_rayjay	570a95ff64	Merge `6119ac9c53` into `351e8fbd43`	2024-10-11 16:24:38 +08:00
Xiaofeng Wang	351e8fbd43	Fixed the compilation issue on macOS15 M platform Some checks failed Android / build (push) Has been cancelled Details CodeQL / Analyze (cpp) (push) Has been cancelled Details CodeQL / Analyze (javascript) (push) Has been cancelled Details Docker / build (push) Has been cancelled Details Linux / build (push) Has been cancelled Details macOS / build (push) Has been cancelled Details Windows / build (push) Has been cancelled Details https://github.com/ZLMediaKit/ZLToolKit/pull/252	2024-10-11 14:23:05 +08:00
rayjay	6119ac9c53	rtp推流增加PCM音频的处理	2024-03-28 11:21:23 +08:00
rayjay	a33c1d5a08	Merge branch 'master' of https://github.com/ZLMediaKit/ZLMediaKit	2024-03-28 11:15:19 +08:00
rayjay	e7e157c312	打包mjepg rtp的时候增加支持DRI(原先只在解包的时候支持,打包的时候并不支持)	2024-02-19 11:20:06 +08:00