Skip to content

Commit

Permalink
Merge branch 'dev-0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelgruner committed Oct 30, 2020
2 parents b1a49ed + f0cfd89 commit 01df710
Show file tree
Hide file tree
Showing 12 changed files with 976 additions and 39 deletions.
18 changes: 17 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,23 @@ missing
*.la
*.lo
*.o
stamp-h1
stamp-*
*-stamp
tools/gst-perf
*~
\#*
*.swp

# dpkg-buildpackage output and other release files
*.debhelper.log
.debhelper/
debian/autoreconf.*
debian/gst-perf.debhelper.log
debian/gst-perf/
debian/files
debian/tmp
/gst-perf-*
*.deb
*.substvars
*.changes
*.buildinfo
481 changes: 481 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

17 changes: 16 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# GstPerf

> A GStreamer element to measure framerate, bitrate and CPU usage
A GStreamer element to measure framerate, bitrate and CPU usage

## Build Instructions

Expand All @@ -24,3 +24,18 @@ encoder:
```bash
gst-launch-1.0 -e videotestsrc ! x264enc ! perf ! qtmux print-arm-load=true ! filesink location=test.mp4
```

## Building a Debian package

1. Install build dependencies (one-time step):
`sudo apt install -y debhelper devscripts`
2. After cloning, run `dpkg-buildpackage -us -uc` in the source directory.
The package will be left in the parent directory.

## Legal

Copyright (c) 2019 RidgeRun, LLC.

Portions copyright (c) 2020 D3 Engineering, LLC.

Licensed LGPL2+ (LGPL-2.0-or-later); see file [LICENSE](LICENSE) for details.
21 changes: 19 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
dnl required version of autoconf
AC_PREREQ([2.53])

dnl TODO: fill in your package name and package version here
AC_INIT([gst-perf],[0.2.4])
dnl package name and package version
dnl NOTE: whenever you change this, also update debian/changelog
dnl (e.g., run `dch -i`).
AC_INIT([gst-perf],[0.3.0])

dnl required versions of gstreamer and plugins-base
GST_REQUIRED=1.0.0
Expand Down Expand Up @@ -61,6 +63,21 @@ PKG_CHECK_MODULES(GST, [
])
])

dnl check for host OS
AC_CANONICAL_HOST

case "${host_os}" in
linux*)
AC_DEFINE([IS_LINUX], [1], [Host OS is Linux])
;;
cygwin*|mingw*)
AC_DEFINE([IS_WINDOWS], [1], [Host OS is Windows])
;;
darwin*)
AC_DEFINE([IS_MACOSX], [1], [Host OS is Mac OSX])
;;
esac

dnl check if compiler understands -Wall (if yes, add -Wall to GST_CFLAGS)
AC_MSG_CHECKING([to see if compiler understands -Wall])
save_CFLAGS="$CFLAGS"
Expand Down
5 changes: 5 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
gst-perf (0.3.0-1) UNRELEASED; urgency=medium

* Initial .deb release

-- Christopher White <[email protected]> Mon, 19 Oct 2020 12:18:19 -0400
1 change: 1 addition & 0 deletions debian/compat
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9
13 changes: 13 additions & 0 deletions debian/control
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Source: gst-perf
Priority: optional
Maintainer: RidgeRun Developers <[email protected]>
Build-Depends: debhelper (>= 8.0.0), devscripts
Standards-Version: 4.1.0
Section: utils

Package: gst-perf
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Measure GStreamer pipeline performance
A GStreamer element to measure framerate, bitrate and CPU usage
100 changes: 100 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: gst-perf
Source: <https://github.com/RidgeRun/gst-perf>

Files: .gitignore
Makefile.am
README.md
autogen.sh
config.h
config.h.in
configure.ac
plugins/Makefile.am
Copyright: __NO_COPYRIGHT_NOR_LICENSE__
License: __NO_COPYRIGHT_NOR_LICENSE__

Files: Makefile.in
aclocal.m4
compile
config.guess
config.sub
configure
depcomp
install-sh
libtool
ltmain.sh
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
missing
plugins/Makefile.in
Copyright: 1992-2018 Free Software Foundation, Inc.
1994 X Consortium
License: __AUTO_PERMISSIVE__
Autogenerated files with permissive licenses.

Files: autom4te.cache/output.0
autom4te.cache/output.1
autom4te.cache/output.2
Copyright: 1992-2012 Free Software Foundation, Inc.
License: PERMISSIVE
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.

Files: Makefile
plugins/Makefile
Copyright: 1994-2017 Free Software Foundation, Inc.
License: PERMISSIVE
This Makefile.in is free software; the Free Software Foundation
gives unlimited permission to copy and/or distribute it,
with or without modifications, as long as this notice is preserved.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY, to the extent permitted by law; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.

Files: plugins/gstperf.h
plugins/gstperf.c
Copyright: 2019 RidgeRun, LLC (http://www.ridgerun.com)
License: LGPL-2.0+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU Library General Public License
Version 2 can be found in `/usr/share/common-licenses/LGPL-2'.

Files: debian/rules
Copyright: 2020 D3 Engineering, LLC (http://www.d3engineering.com)
License: LGPL-2.0+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
Boston, MA 02110-1301, USA.
.
On Debian systems, the complete text of the GNU Library General Public License
Version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
9 changes: 9 additions & 0 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/make -f
# Copyright (c) 2020 D3 Engineering, LLC
# By Christopher White <[email protected]>
# SPDX-License-Identifier: LGPL-2.0-or-later

export DH_ALWAYS_EXCLUDE=*.a:*.la

%:
dh $@
1 change: 1 addition & 0 deletions debian/source/format
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.0
Loading

0 comments on commit 01df710

Please sign in to comment.