Unverified Commit d040b949 authored by Gus Grubba's avatar Gus Grubba Committed by GitHub

Merge pull request #8336 from andrewvoznytsa/pr-filesink-fix

MKV file recording fix
parents dac7429b 625d3f47
This diff is collapsed.
......@@ -85,6 +85,7 @@ protected slots:
virtual void _updateTimer ();
#if defined(QGC_GST_STREAMING)
GstElement* _makeSource (const QString& uri);
GstElement* _makeFileSink (const QString& videoFile, unsigned format);
virtual void _restart_timeout ();
virtual void _tcp_timeout ();
virtual void _connected ();
......@@ -101,7 +102,6 @@ protected:
{
GstPad* teepad;
GstElement* queue;
GstElement* mux;
GstElement* filesink;
gboolean removing;
} Sink;
......@@ -122,13 +122,12 @@ protected:
static GstPadProbeReturn _videoSinkProbe (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 _shutdownPipeline ();
virtual void _cleanupOldVideos ();
GstElement* _pipeline;
GstElement* _pipelineStopRec;
GstElement* _videoSink;
guint64 _lastFrameId;
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