Commit 4f4af952 authored by Andrew Voznytsa's avatar Andrew Voznytsa

Simplify file recording handling

parent a6d15868
This diff is collapsed.
...@@ -85,6 +85,7 @@ protected slots: ...@@ -85,6 +85,7 @@ protected slots:
virtual void _updateTimer (); virtual void _updateTimer ();
#if defined(QGC_GST_STREAMING) #if defined(QGC_GST_STREAMING)
GstElement* _makeSource (const QString& uri); GstElement* _makeSource (const QString& uri);
GstElement* _makeFileSink (const QString& videoFile, unsigned format);
virtual void _restart_timeout (); virtual void _restart_timeout ();
virtual void _tcp_timeout (); virtual void _tcp_timeout ();
virtual void _connected (); virtual void _connected ();
...@@ -101,7 +102,6 @@ protected: ...@@ -101,7 +102,6 @@ protected:
{ {
GstPad* teepad; GstPad* teepad;
GstElement* queue; GstElement* queue;
GstElement* mux;
GstElement* filesink; GstElement* filesink;
gboolean removing; gboolean removing;
} Sink; } Sink;
...@@ -122,13 +122,12 @@ protected: ...@@ -122,13 +122,12 @@ protected:
static GstPadProbeReturn _videoSinkProbe (GstPad* pad, GstPadProbeInfo* info, gpointer user_data); static GstPadProbeReturn _videoSinkProbe (GstPad* pad, GstPadProbeInfo* info, gpointer user_data);
static GstPadProbeReturn _keyframeWatch (GstPad* pad, GstPadProbeInfo* info, gpointer user_data); static GstPadProbeReturn _keyframeWatch (GstPad* pad, GstPadProbeInfo* info, gpointer user_data);
virtual void _detachRecordingBranch (GstPadProbeInfo* info); virtual void _unlinkRecordingBranch (GstPadProbeInfo* info);
virtual void _shutdownRecordingBranch(); virtual void _shutdownRecordingBranch();
virtual void _shutdownPipeline (); virtual void _shutdownPipeline ();
virtual void _cleanupOldVideos (); virtual void _cleanupOldVideos ();
GstElement* _pipeline; GstElement* _pipeline;
GstElement* _pipelineStopRec;
GstElement* _videoSink; GstElement* _videoSink;
guint64 _lastFrameId; guint64 _lastFrameId;
qint64 _lastFrameTime; qint64 _lastFrameTime;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment