From 2d062c1f99c31c39d04e246c89c57120cb89c3ce Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Sun, 11 Apr 2021 14:26:37 +0200 Subject: [PATCH] Fifo+EventStream: Remove unused private fields --- src/zm_eventstream.h | 7 +------ src/zm_fifo.h | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h index ef873c25d..54b7687ab 100644 --- a/src/zm_eventstream.h +++ b/src/zm_eventstream.h @@ -102,10 +102,7 @@ class EventStream : public StreamBase { send_frame(false), event_data(nullptr), storage(nullptr), - ffmpeg_input(nullptr), - // Used when loading frames from an mp4 - input_codec_context(nullptr), - input_codec(nullptr) + ffmpeg_input(nullptr) {} ~EventStream() { if ( event_data ) { @@ -135,8 +132,6 @@ class EventStream : public StreamBase { bool send_buffer(uint8_t * buffer, int size); Storage *storage; FFmpeg_Input *ffmpeg_input; - AVCodecContext *input_codec_context; - AVCodec *input_codec; }; #endif // ZM_EVENTSTREAM_H diff --git a/src/zm_fifo.h b/src/zm_fifo.h index 70dfdbb51..cd47cfda4 100644 --- a/src/zm_fifo.h +++ b/src/zm_fifo.h @@ -27,8 +27,6 @@ class Monitor; class Fifo { private: std::string path; - int total_read; - int bytes_read; bool on_blocking_abort; FILE *outfile; int raw_fd; @@ -40,17 +38,13 @@ class Fifo { bool delete_fake_fifo = true ); - Fifo() : - total_read(0), - bytes_read(0), + Fifo() : on_blocking_abort(true), outfile(nullptr), raw_fd(-1) {} Fifo(const char *p_path, bool p_on_blocking_abort) : path(p_path), - total_read(0), - bytes_read(0), on_blocking_abort(p_on_blocking_abort), outfile(nullptr), raw_fd(-1)