roc-streaminggh-183: Remove is_alive from Watchdog and LatencyMonitor

is_alive() mechanism is replaces with status codes and is no longer used.
gavv · Jul 26, 2024 · 883cc07 · 883cc07
1 parent a0ca351
commit 883cc07
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 46 deletions.
diff --git a/src/internal_modules/roc_audio/latency_monitor.cpp b/src/internal_modules/roc_audio/latency_monitor.cpp
@@ -36,7 +36,6 @@ LatencyMonitor::LatencyMonitor(IFrameReader& frame_reader,
     , capture_ts_(0)
     , packet_sample_spec_(packet_sample_spec)
     , frame_sample_spec_(frame_sample_spec)
-    , alive_(true)
     , init_status_(status::NoStatus) {
     if ((init_status_ = tuner_.init_status()) != status::StatusOK) {
         return;
@@ -56,12 +55,6 @@ status::StatusCode LatencyMonitor::init_status() const {
     return init_status_;
 }
 
-bool LatencyMonitor::is_alive() const {
-    roc_panic_if(init_status_ != status::StatusOK);
-
-    return alive_;
-}
-
 const LatencyMetrics& LatencyMonitor::metrics() const {
     roc_panic_if(init_status_ != status::StatusOK);
 
@@ -73,15 +66,10 @@ status::StatusCode LatencyMonitor::read(Frame& frame,
                                         FrameReadMode mode) {
     roc_panic_if(init_status_ != status::StatusOK);
 
-    if (!alive_) {
-        return status::StatusAbort;
-    }
-
     compute_niq_latency_();
     query_metrics_();
 
     if (!pre_read_()) {
-        alive_ = false;
         return status::StatusAbort;
     }
 

diff --git a/src/internal_modules/roc_audio/latency_monitor.h b/src/internal_modules/roc_audio/latency_monitor.h
@@ -75,9 +75,6 @@ class LatencyMonitor : public IFrameReader, public core::NonCopyable<> {
     //! Check if the object was successfully constructed.
     status::StatusCode init_status() const;
 
-    //! Check if the stream was not aborted.
-    bool is_alive() const;
-
     //! Get metrics.
     const LatencyMetrics& metrics() const;
 
@@ -124,8 +121,6 @@ class LatencyMonitor : public IFrameReader, public core::NonCopyable<> {
     const SampleSpec packet_sample_spec_;
     const SampleSpec frame_sample_spec_;
 
-    bool alive_;
-
     status::StatusCode init_status_;
 };
 

diff --git a/src/internal_modules/roc_audio/watchdog.cpp b/src/internal_modules/roc_audio/watchdog.cpp
@@ -58,7 +58,6 @@ Watchdog::Watchdog(IFrameReader& reader,
     , status_(arena)
     , status_pos_(0)
     , show_status_(false)
-    , alive_(true)
     , init_status_(status::NoStatus) {
     if (config.no_playback_timeout >= 0) {
         max_blank_duration_ =
@@ -116,20 +115,10 @@ status::StatusCode Watchdog::init_status() const {
     return init_status_;
 }
 
-bool Watchdog::is_alive() const {
-    roc_panic_if(init_status_ != status::StatusOK);
-
-    return alive_;
-}
-
 status::StatusCode
 Watchdog::read(Frame& frame, packet::stream_timestamp_t duration, FrameReadMode mode) {
     roc_panic_if(init_status_ != status::StatusOK);
 
-    if (!alive_) {
-        return status::StatusAbort;
-    }
-
     const status::StatusCode code = reader_.read(frame, duration, mode);
     if (code != status::StatusOK && code != status::StatusPart) {
         return code;
@@ -138,7 +127,6 @@ Watchdog::read(Frame& frame, packet::stream_timestamp_t duration, FrameReadMode
     sample_spec_.validate_frame(frame);
 
     if (!update_(frame)) {
-        alive_ = false;
         return status::StatusAbort;
     }
 

diff --git a/src/internal_modules/roc_audio/watchdog.h b/src/internal_modules/roc_audio/watchdog.h
@@ -102,9 +102,6 @@ class Watchdog : public IFrameReader, public core::NonCopyable<> {
     //! Check if the object was successfully constructed.
     status::StatusCode init_status() const;
 
-    //! Check if the stream was not aborted.
-    bool is_alive() const;
-
     //! Read audio frame.
     //! @remarks
     //!  Updates stream state and reads frame from the input reader.
@@ -148,7 +145,6 @@ class Watchdog : public IFrameReader, public core::NonCopyable<> {
     size_t status_pos_;
     bool show_status_;
 
-    bool alive_;
     status::StatusCode init_status_;
 };
 

diff --git a/src/tests/roc_audio/test_watchdog.cpp b/src/tests/roc_audio/test_watchdog.cpp
@@ -77,10 +77,6 @@ void expect_read(status::StatusCode expected_status,
         for (size_t n = 0; n < frame->num_raw_samples(); n++) {
             DOUBLES_EQUAL(magic_sample, (double)frame->raw_samples()[n], 0);
         }
-
-        CHECK(watchdog.is_alive());
-    } else {
-        CHECK(!watchdog.is_alive());
     }
 }
 
@@ -179,9 +175,6 @@ TEST(watchdog, no_playback_timeout_blank_frames) {
 
     meta_reader.set_flags(0);
     expect_read(status::StatusAbort, watchdog, SamplesPerFrame);
-
-    meta_reader.set_flags(Frame::HasSignal);
-    expect_read(status::StatusAbort, watchdog, SamplesPerFrame);
 }
 
 TEST(watchdog, no_playback_timeout_blank_and_non_blank_frames) {
@@ -341,9 +334,6 @@ TEST(watchdog, broken_playback_timeout_equal_frame_sizes) {
 
         meta_reader.set_flags(Frame::HasSignal | Frame::HasGaps | Frame::HasDrops);
         expect_read(status::StatusAbort, watchdog, BreakageWindow);
-
-        meta_reader.set_flags(Frame::HasSignal);
-        expect_read(status::StatusAbort, watchdog, BreakageWindow);
     }
 }
 
@@ -604,9 +594,6 @@ TEST(watchdog, warmup_early_nonblank) {
 
     meta_reader.set_flags(0);
     expect_read(status::StatusAbort, watchdog, SamplesPerFrame);
-
-    meta_reader.set_flags(Frame::HasSignal);
-    expect_read(status::StatusAbort, watchdog, SamplesPerFrame);
 }
 
 // Forwarding mode to underlying reader.