eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 11:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Detecting EOF recording and unexpected termination

Browse Source
This commit is contained in:
Bruno
2021-08-06 21:23:01 +02:00
parent e9b7e55570
commit fb3e1d0d25
5 changed files with 41 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
FrameGrabber.cpp
View File

@@ -214,7 +214,7 @@ void FrameGrabbing::grabFrame(FrameBuffer *frame_buffer, float dt)
FrameGrabber::FrameGrabber(): finished_(false), active_(false), accept_buffer_(false),
FrameGrabber::FrameGrabber(): finished_(false), expecting_finished_(false), active_(false), accept_buffer_(false),
pipeline_(nullptr), src_(nullptr), caps_(nullptr), timestamp_(0)
{
// unique id
@@ -257,6 +257,7 @@ uint64_t FrameGrabber::duration() const
void FrameGrabber::stop ()
{
// send end of stream
expecting_finished_ = true;
gst_app_src_end_of_stream (src_);
// stop recording
@@ -287,6 +288,19 @@ void FrameGrabber::callback_enough_data (GstAppSrc *, gpointer p)
grabber->accept_buffer_ = false;
}
GstPadProbeReturn FrameGrabber::callback_event_probe(GstPad *, GstPadProbeInfo * info, gpointer user_data)
{
GstEvent *event = GST_PAD_PROBE_INFO_EVENT(info);
if (GST_EVENT_TYPE (event) == GST_EVENT_EOS)
{
FrameGrabber *g = static_cast<FrameGrabber *>(user_data);
if (g)
g->finished_ = true;
}
return GST_PAD_PROBE_OK;
}
void FrameGrabber::addFrame (GstBuffer *buffer, GstCaps *caps, float dt)
{
// ignore
@@ -294,23 +308,29 @@ void FrameGrabber::addFrame (GstBuffer *buffer, GstCaps *caps, float dt)
return;
// first time initialization
if (pipeline_ == nullptr)
if (pipeline_ == nullptr) {
// type specific initialisation
init(caps);
// generic EOS detector
GstPad *pad = gst_element_get_static_pad (gst_bin_get_by_name (GST_BIN (pipeline_), "sink"), "sink");
gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, FrameGrabber::callback_event_probe, this, NULL);
gst_object_unref (pad);
}
// cancel if finished
if (finished_)
return;
// terminate properly if finished
if (finished_) {
terminate();
}
// stop if an incompatilble frame buffer given
if ( !gst_caps_is_equal( caps_, caps ))
else if ( !gst_caps_is_equal( caps_, caps ))
{
stop();
// Log::Warning("FrameGrabber interrupted: new session (%s)\nincompatible with recording (%s)", gst_caps_to_string(frame.caps), gst_caps_to_string(caps_));
Log::Warning("FrameGrabber interrupted because the resolution changed.");
}
// store a frame if recording is active
if (active_)
else if (active_)
{
// calculate dt in ns
timeframe_ += gst_gdouble_to_guint64( dt * 1000000.f );
@@ -339,27 +359,5 @@ void FrameGrabber::addFrame (GstBuffer *buffer, GstCaps *caps, float dt)
timeframe_ = 0;
}
}
// did the recording terminate with sink receiving end-of-stream ?
else {
if (!finished_)
{
// Wait for EOS message
GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline_));
GstMessage *msg = gst_bus_poll(bus, GST_MESSAGE_EOS, GST_TIME_AS_USECONDS(1));
// received EOS
if (msg) {
// stop the pipeline
GstStateChangeReturn ret = gst_element_set_state (pipeline_, GST_STATE_NULL);
if (ret == GST_STATE_CHANGE_FAILURE)
Log::Warning("FrameGrabber Could not stop.");
finished_ = true;
}
}
}
if (finished_)
terminate();
}

5
FrameGrabber.h
View File

@@ -53,6 +53,7 @@ protected:
virtual void terminate() = 0;
// thread-safe testing termination
std::atomic<bool> expecting_finished_;
std::atomic<bool> finished_;
std::atomic<bool> active_;
std::atomic<bool> accept_buffer_;
@@ -67,8 +68,8 @@ protected:
// gstreamer callbacks
static void callback_need_data (GstAppSrc *, guint, gpointer user_data);
static void callback_enough_data (GstAppSrc *, gpointer user_data);
static void callback_enough_data (GstAppSrc *, gpointer user_data);
static GstPadProbeReturn callback_event_probe(GstPad *, GstPadProbeInfo *info, gpointer user_data);
};
/**

1
Loopback.cpp
View File

@@ -237,5 +237,6 @@ void Loopback::init(GstCaps *caps)
void Loopback::terminate()
{
active_ = false;
Log::Notify("Loopback to %s terminated.", Loopback::system_loopback_name.c_str());
}

47
Recorder.cpp
View File

@@ -104,6 +104,7 @@ void PNGRecorder::init(GstCaps *caps)
void PNGRecorder::terminate()
{
active_ = false;
Log::Notify("PNG Capture %s is ready.", filename_.c_str());
}
@@ -201,40 +202,6 @@ VideoRecorder::VideoRecorder() : FrameGrabber()
{
}
//static GstPadProbeReturn
//event_probe(GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
//{
// GstEvent *event = GST_PAD_PROBE_INFO_EVENT(info);
// if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
// g_print ("Got event: %s\n", GST_EVENT_TYPE_NAME (event));
// }
// if (GST_EVENT_TYPE (event) == GST_EVENT_LATENCY) {
// g_print ("Got event: %s\n", GST_EVENT_TYPE_NAME (event));
// }
//// g_print ("Got event: %s", GST_EVENT_TYPE_NAME (event));
//// if (GST_PAD_PROBE_INFO_TYPE(info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) {
//// g_print (" (downstream)\n");
//// if (GST_EVENT_TYPE (event) == GST_EVENT_SEGMENT) {
////// gint64 duration = 0;
////// gst_pad_peer_query_duration (pad, GST_FORMAT_TIME, &duration);
////// g_print ("duration: %ld\n", duration);
//// }
//// }
//// else {
//// g_print (" (upstream)\n");
//// }
// return GST_PAD_PROBE_OK;
//}
void VideoRecorder::init(GstCaps *caps)
{
// ignore
@@ -284,12 +251,6 @@ void VideoRecorder::init(GstCaps *caps)
"sync", FALSE,
NULL);
// // setup EOS detector
// gulong probe_id;
// GstPad *pad = gst_element_get_static_pad (gst_bin_get_by_name (GST_BIN (pipeline_), "sink"), "sink");
// probe_id = gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_BOTH, event_probe, NULL, NULL);
// gst_object_unref (pad);
// setup custom app source
src_ = GST_APP_SRC( gst_bin_get_by_name (GST_BIN (pipeline_), "src") );
if (src_) {
@@ -339,7 +300,11 @@ void VideoRecorder::init(GstCaps *caps)
void VideoRecorder::terminate()
{
Log::Notify("Video Recording %s is ready.", filename_.c_str());
active_ = false;
if (expecting_finished_)
Log::Notify("Video Recording %s is ready.", filename_.c_str());
else
Log::Warning("Recording interrupted (no more disk space?).");
}
std::string VideoRecorder::info() const

3
Streamer.cpp
View File

@@ -389,6 +389,8 @@ void VideoStreamer::init(GstCaps *caps)
void VideoStreamer::terminate()
{
active_ = false;
// send EOS
gst_app_src_end_of_stream (src_);
@@ -414,6 +416,7 @@ void VideoStreamer::stop ()
// force finished
finished_ = true;
active_ = false;
}
std::string VideoStreamer::info() const