AI: Add utest.

Author: ossrs-ai

trunk/src/app/srs_app_factory.cpp

@@ -15,6 +15,7 @@
 #ifdef SRS_GB28181
 #include <srs_app_gb28181.hpp>
 #endif
+#include <srs_app_hls.hpp>
 #include <srs_app_ingest.hpp>
 #include <srs_app_listener.hpp>
 #include <srs_app_rtc_conn.hpp>
@@ -173,6 +174,11 @@ ISrsFragmentedMp4 *SrsAppFactory::create_fragmented_mp4()
     return new SrsFragmentedMp4();
 }
 
+SrsHlsM4sSegment *SrsAppFactory::create_hls_m4s_segment(ISrsFileWriter *fw)
+{
+    return new SrsHlsM4sSegment(fw);
+}
+
 ISrsIpListener *SrsAppFactory::create_tcp_listener(ISrsTcpHandler *handler)
 {
     return new SrsTcpListener(handler);

trunk/src/app/srs_app_factory.hpp

@@ -35,6 +35,7 @@ class ISrsFragment;
 class ISrsInitMp4;
 class ISrsFragmentWindow;
 class ISrsFragmentedMp4;
+class SrsHlsM4sSegment;
 class SrsFinalFactory;
 class ISrsIpListener;
 class ISrsTcpHandler;
@@ -89,6 +90,7 @@ class ISrsAppFactory : public ISrsKernelFactory
     virtual ISrsInitMp4 *create_init_mp4() = 0;
     virtual ISrsFragmentWindow *create_fragment_window() = 0;
     virtual ISrsFragmentedMp4 *create_fragmented_mp4() = 0;
+    virtual SrsHlsM4sSegment *create_hls_m4s_segment(ISrsFileWriter *fw) = 0;
     virtual ISrsIpListener *create_tcp_listener(ISrsTcpHandler *handler) = 0;
     virtual ISrsRtcConnection *create_rtc_connection(ISrsExecRtcAsyncTask *exec, const SrsContextId &cid) = 0;
     virtual ISrsFFMPEG *create_ffmpeg(std::string ffmpeg_bin) = 0;
@@ -142,6 +144,7 @@ class SrsAppFactory : public ISrsAppFactory
     virtual ISrsInitMp4 *create_init_mp4();
     virtual ISrsFragmentWindow *create_fragment_window();
     virtual ISrsFragmentedMp4 *create_fragmented_mp4();
+    virtual SrsHlsM4sSegment *create_hls_m4s_segment(ISrsFileWriter *fw);
     virtual ISrsIpListener *create_tcp_listener(ISrsTcpHandler *handler);
     virtual ISrsRtcConnection *create_rtc_connection(ISrsExecRtcAsyncTask *exec, const SrsContextId &cid);
     virtual ISrsFFMPEG *create_ffmpeg(std::string ffmpeg_bin);

trunk/src/app/srs_app_hls.cpp

@@ -426,7 +426,6 @@ SrsHlsFmp4Muxer::SrsHlsFmp4Muxer()
     segments_ = new SrsFragmentWindow();
     latest_acodec_ = SrsAudioCodecIdForbidden;
     latest_vcodec_ = SrsVideoCodecIdForbidden;
-    sequence_header_ = false;
     video_track_id_ = 0;
     audio_track_id_ = 0;
     init_mp4_ready_ = false;
@@ -796,14 +795,9 @@ srs_error_t SrsHlsFmp4Muxer::segment_open(srs_utime_t basetime)
     }
 
     // new segment.
-    current_ = new SrsHlsM4sSegment(writer_);
+    current_ = app_factory_->create_hls_m4s_segment(writer_);
     current_->sequence_no_ = sequence_no_++;
 
-    if (sequence_header_) {
-        current_->set_sequence_header(true);
-        sequence_header_ = false;
-    }
-
     if ((err = write_hls_key()) != srs_success) {
         return srs_error_wrap(err, "write hls key");
     }
@@ -901,7 +895,6 @@ bool SrsHlsFmp4Muxer::is_segment_open()
 
 srs_error_t SrsHlsFmp4Muxer::on_sequence_header()
 {
-    sequence_header_ = true;
     return srs_success;
 }
 

trunk/src/app/srs_app_hls.hpp

@@ -488,8 +488,6 @@ class SrsHlsFmp4Muxer
     // The current writing segment.
     SrsHlsM4sSegment *current_;
 
-    bool sequence_header_;
-
 // clang-format off
 SRS_DECLARE_PRIVATE: // clang-format on
     // Latest audio codec, parsed from stream.

trunk/src/utest/srs_utest_ai24.cpp

@@ -15,6 +15,7 @@
 #include <srs_app_utility.hpp>
 #include <srs_kernel_codec.hpp>
 #include <srs_kernel_error.hpp>
+#include <srs_kernel_mp4.hpp>
 #include <srs_kernel_packet.hpp>
 #include <srs_kernel_rtc_rtcp.hpp>
 #include <srs_kernel_utility.hpp>
@@ -1416,3 +1417,88 @@ VOID TEST(HttpApiPaginationTest, ParsePagination)
         EXPECT_EQ(500, count);
     }
 }
+
+// Mock SrsHlsM4sSegment to capture dts passed to reap()
+// Used for testing issue #4594
+class MockSrsHlsM4sSegmentForBug4594 : public SrsHlsM4sSegment
+{
+public:
+    uint64_t captured_reap_dts_;
+    bool reap_called_;
+
+    MockSrsHlsM4sSegmentForBug4594() : SrsHlsM4sSegment(NULL), captured_reap_dts_(0), reap_called_(false) {}
+    virtual ~MockSrsHlsM4sSegmentForBug4594() {}
+
+    // Override reap to capture the dts parameter
+    virtual srs_error_t reap(uint64_t dts) {
+        reap_called_ = true;
+        captured_reap_dts_ = dts;
+        return srs_success;
+    }
+};
+
+// Mock factory to create MockSrsHlsM4sSegmentForBug4594
+class MockAppFactoryForBug4594 : public SrsAppFactory
+{
+public:
+    MockSrsHlsM4sSegmentForBug4594 *mock_segment_;
+
+    MockAppFactoryForBug4594() : mock_segment_(NULL) {}
+    virtual ~MockAppFactoryForBug4594() {}
+
+    virtual SrsHlsM4sSegment *create_hls_m4s_segment(ISrsFileWriter *fw) {
+        mock_segment_ = new MockSrsHlsM4sSegmentForBug4594();
+        return mock_segment_;
+    }
+};
+
+// Test for issue #4594: SrsHlsMp4Controller::on_unpublish() passes video_dts_=0 to reap()
+// for audio-only streams.
+//
+// When on_unpublish() is called for audio-only streams, the muxer's video_dts_ is 0 because
+// write_video() is never called. This causes reap(0) to be called, leading to
+// incorrect last sample duration calculation (overflow to huge values like 4294894594).
+//
+// @see https://github.com/ossrs/srs/issues/4594
+// @see https://github.com/ossrs/srs/pull/4602
+VOID TEST(HlsFmp4AudioOnlyBugTest, OnUnpublishUsesVideoDtsZeroForAudioOnly)
+{
+    srs_error_t err;
+
+    // Create SrsHlsMp4Controller - the entry point for HLS fMP4
+    SrsHlsMp4Controller controller;
+
+    // Access the internal muxer
+    SrsHlsFmp4Muxer *muxer = controller.muxer_;
+
+    // Set up mock request (required by do_segment_close for async hooks)
+    MockRequest mock_req("test_vhost", "live", "stream");
+    muxer->req_ = &mock_req;
+
+    // Create mock segment that captures the dts passed to reap()
+    MockSrsHlsM4sSegmentForBug4594 *mock_segment = new MockSrsHlsM4sSegmentForBug4594();
+    muxer->current_ = mock_segment;
+
+    // Simulate audio-only stream condition:
+    // - controller.audio_dts_ has a value (audio packets were written)
+    // - controller.video_dts_ is 0 (no video packets, write_video() never called)
+    controller.audio_dts_ = 72702;  // Example audio DTS in milliseconds
+    controller.video_dts_ = 0;      // No video for audio-only stream
+
+    // Call on_unpublish() - this triggers the bug path
+    HELPER_EXPECT_SUCCESS(controller.on_unpublish());
+
+    // Verify reap was called
+    ASSERT_TRUE(mock_segment->reap_called_) << "reap() should have been called by on_unpublish()";
+
+    // THE BUG TEST:
+    // This test SHOULD FAIL on the buggy develop branch because
+    // captured_reap_dts_ will be 0 instead of a proper audio timestamp (72702)
+    EXPECT_GT(mock_segment->captured_reap_dts_, 0u)
+        << "Bug #4594: on_unpublish() resulted in reap(dts=0) for audio-only stream! "
+        << "Expected non-zero dts (e.g., audio_dts_=" << controller.audio_dts_ << ") "
+        << "but reap() received " << mock_segment->captured_reap_dts_;
+
+    // Cleanup
+    muxer->req_ = NULL;
+}