From 9bff0578601a8595ef70ae6d1ee9dd47841ef073 Mon Sep 17 00:00:00 2001
From: xia-chu <771730766@qq.com>
Date: Sun, 3 May 2026 19:33:43 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8Dmp4=5Fas=5Fplayer?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA1=E6=97=B6=EF=BC=8Con=5Fstream=5Fnon?=
 =?UTF-8?q?e=5Freader=E5=9B=9E=E8=B0=83=E6=97=A0=E6=95=88=E6=B5=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#4725)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6f9531c5fa570aaca665e71fbc85e0e7f62ac5b7.
---
 src/Common/MediaSource.cpp           | 6 +++---
 src/Common/MediaSource.h             | 3 +--
 src/Common/MultiMediaSourceMuxer.cpp | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Common/MediaSource.cpp b/src/Common/MediaSource.cpp
index 8b7a1b61..f1f210bd 100644
--- a/src/Common/MediaSource.cpp
+++ b/src/Common/MediaSource.cpp
@@ -67,12 +67,12 @@ ProtocolOption::ProtocolOption() {
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 struct MediaSourceNull : public MediaSource {
-    MediaSourceNull(const MediaTuple &tuple) : MediaSource("schema", tuple) {};
+    MediaSourceNull() : MediaSource("schema", MediaTuple{"vhost", "app", "stream", ""}) {};
     int readerCount() override { return 0; }
 };
 
-MediaSource &MediaSource::NullMediaSource(const MediaTuple &tuple) {
-    static std::shared_ptr<MediaSource> s_null = std::make_shared<MediaSourceNull>(tuple);
+MediaSource &MediaSource::NullMediaSource() {
+    static std::shared_ptr<MediaSource> s_null = std::make_shared<MediaSourceNull>();
     return *s_null;
 }
 
diff --git a/src/Common/MediaSource.h b/src/Common/MediaSource.h
index 621c859e..fc7f77d2 100644
--- a/src/Common/MediaSource.h
+++ b/src/Common/MediaSource.h
@@ -397,8 +397,7 @@ bool equalMediaTuple(const MediaTuple& a, const MediaTuple& b);
  */
 class MediaSource: public TrackSource, public std::enable_shared_from_this<MediaSource> {
 public:
-    static MediaSource &NullMediaSource(const MediaTuple &tuple = {"vhost", "app", "stream" });
-
+    static MediaSource& NullMediaSource();
     using Ptr = std::shared_ptr<MediaSource>;
 
     MediaSource(const std::string &schema, const MediaTuple& tuple);
diff --git a/src/Common/MultiMediaSourceMuxer.cpp b/src/Common/MultiMediaSourceMuxer.cpp
index 43645abc..c3985615 100644
--- a/src/Common/MultiMediaSourceMuxer.cpp
+++ b/src/Common/MultiMediaSourceMuxer.cpp
@@ -319,7 +319,7 @@ bool MultiMediaSourceMuxer::setupRecord(Recorder::type type, bool start, const s
         if (_option.mp4_as_player && type == Recorder::type_mp4) {
             // 开启关闭mp4录制，触发观看人数变化相关事件  [AUTO-TRANSLATED:b63a8deb]
             // Turn on/off mp4 recording, trigger events related to changes in the number of viewers
-            onReaderChanged(MediaSource::NullMediaSource(_tuple), totalReaderCount());
+            onReaderChanged(MediaSource::NullMediaSource(), totalReaderCount());
         }
     });
     switch (type) {