From a254e47d0bee02d67e6e979e4b4c28656ee15fc7 Mon Sep 17 00:00:00 2001 From: hyades Date: Wed, 18 Sep 2013 02:10:53 -0700 Subject: [PATCH 1/8] Added file FORKING.md --- FORKING.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 FORKING.md diff --git a/FORKING.md b/FORKING.md new file mode 100644 index 0000000..e69de29 From 8e090dab9043cfcfa16838c3951040e784e02d93 Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Wed, 18 Sep 2013 15:22:39 +0530 Subject: [PATCH 2/8] Update FORKING.md [skip-ci] --- FORKING.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/FORKING.md b/FORKING.md index e69de29..3d0bfc5 100644 --- a/FORKING.md +++ b/FORKING.md @@ -0,0 +1,19 @@ +##Forking Gst-Switch + +To fork this project, click the "Fork" button at [Gst-Switch Github Page](https://github.com/hyades/gst-switch ""). +![forking](https://github-images.s3.amazonaws.com/help/Bootcamp-Fork.png "forking") + +Refer to the [Github Documentation](https://help.github.com/articles/fork-a-repo "") for further details. + +##Running Tests + +* Install gst-switch using instructions at [README.md](https://github.com/hyades/gst-switch/blob/master/README.md ""). +* `cd python-api` +* make test +* For specific tests refer to [Python-API Readme](https://github.com/hyades/gst-switch/blob/master/python-api/README.md ""). + +##Sending Pull Requests for Changes + +* Click the **Compare and Review** button +* Ensure that the Travis message shows **Success: The Travis Build Passed** +* Send the pull request From b144dbc40a456ab5e068fb8ffdf6e7df78aeedee Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Wed, 18 Sep 2013 15:25:03 +0530 Subject: [PATCH 3/8] Update README.md [skip-ci] --- README.md | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 300dde4..9d912bd 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,27 @@ [![Build Status](https://travis-ci.org/hyades/gst-switch.png?branch=master)](https://travis-ci.org/hyades/gst-switch) [![Coverage Status](https://coveralls.io/repos/hyades/gst-switch/badge.png?branch=master)](https://coveralls.io/r/hyades/gst-switch?branch=master) -# GstSwitch +# gst-switch ## Purpose -This project is intended to be a replacement of DV-switch base on GStreamer. +This project is intended tog be a replacement of DV-switch base on GStreamer. +##Installing gst-switch +```bash +git clone https://github.com/hyades/gst-switch.git +cd gst-switch +./.travis-setup.sh +``` +or you can do +```bash +wget https://raw.github.com/hyades/gst-switch/master/scripts/install.sh +chmod +x install.sh +./install.sh +``` +The dependencies are taken care by the installation method. ## Components -GstSwitch contains two parts, *gst-switch-srv* and *gst-switch-ui* +gst-switch contains two parts, *gst-switch-srv* and *gst-switch-ui* ## Quick Manual -### The GstSwitch Server -The GstSwitch server will open at least three ports for video/audio input, and +### The gst-switch Server +The gst-switch server will open at least three ports for video/audio input, and command controls. #### Video Input The video input port is *3000*. Supported input video format: I420 @@ -58,16 +71,3 @@ The command control port is *5000*. e.g. *record 2013-01-23 131139.dat* -##Installing GstSwitch -```bash -git clone https://github.com/hyades/gst-switch.git -cd gst-switch -./.travis-setup.sh -``` -or you can do -```bash -wget https://raw.github.com/hyades/gst-switch/master/scripts/install.sh -chmod +x install.sh -./install.sh -``` -The dependencies are taken care by the installation method. From 10d3364e62edddb0e172d8bf7c5538443d6576ad Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Wed, 18 Sep 2013 15:36:47 +0530 Subject: [PATCH 4/8] Update WRITING_TESTS.md [skip-ci] --- python-api/WRITING_TESTS.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/python-api/WRITING_TESTS.md b/python-api/WRITING_TESTS.md index 3f35980..be83752 100644 --- a/python-api/WRITING_TESTS.md +++ b/python-api/WRITING_TESTS.md @@ -1,4 +1,3 @@ - ##Writing Tests Using Python-API ###Import the Modules Ensure that gst-switch/python-api/gstswitch is in PYTHONPATH: @@ -7,7 +6,7 @@ import sys sys.path.insert(0, install_dir + 'gst-switch/python-api/gstswitch') # install_dir is the path where the installation started ``` -###Start the GstSwitch Server +###Start the gst-switch Server ```python from gstswitch.server import Server @@ -53,7 +52,7 @@ controller.establish_connection() * Switch the Channel. Channel is specified as `ord('A')`, `ord('a')` or `ord('b')`. `result = controller.switch(channel=ord('A'), port=3004)` * Start a New Record: `result = controller.new_record()` -###Terminating the GstSwitch Server +###Terminating the gst-switch Server The `server.run()` should always be kept in a try/finally block, so that if any Exception is caught, all processes terminate safely. i.e. ```python From 5c13659fbdec5187219acf00176a91ef90bc53c2 Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Wed, 18 Sep 2013 15:43:01 +0530 Subject: [PATCH 5/8] Update .travis-setup.sh --- .travis-setup.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis-setup.sh b/.travis-setup.sh index 44088bb..81a1164 100644 --- a/.travis-setup.sh +++ b/.travis-setup.sh @@ -107,10 +107,8 @@ sudo make install || { exit -1 } cd .. -git clone https://github.com/duzy/gst-plugins-bad.git +git clone https://github.com/hyades/gst-plugins-bad.git cd gst-plugins-bad -git checkout speakertrack_new -git checkout ./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 From 1584afb0c5ab47f6c20e635a27290c6eaf4c609b Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Wed, 18 Sep 2013 15:43:28 +0530 Subject: [PATCH 6/8] Update install.sh --- scripts/install.sh | 52 ++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 3e402ff..032490b 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,23 +5,19 @@ sudo pip install mock sudo pip install pytest-cov sudo pip install pytest-pep8 sudo pip install pylint -echo 'yes' | sudo add-apt-repository ppa:gstreamer-developers/ppa -sudo apt-get update -sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 -sudo apt-get -y install python-gi python3-gi gstreamer1.0-tools gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0 gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-plugins-bad gstreamer1.0-libav +sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 +sudo apt-get -y install python-gi sudo apt-get -y install python-scipy ffmpeg -sudo apt-get -y build-dep gstreamer1.0 sudo apt-get -y install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex - export PKG_CONFIG_PATH=/usr/lib/pkgconfig/ export LD_LIBRARY_PATH=/usr/lib/ git clone http://git.chromium.org/webm/libvpx.git cd libvpx git checkout v1.2.0 -./configure --enable-shared --enable-vp8 +./configure --enable-shared --enable-vp8 --prefix=/usr [[ -f Makefile ]] || { - printf "Configure libvpx failed, no Makefile generated!!!\n" - exit -1 + printf "Configure libvpx failed, no Makefile generated!!!\n" + exit -1 } make sudo make install || { @@ -32,13 +28,13 @@ cd .. git clone git://anongit.freedesktop.org/gstreamer/gstreamer cd gstreamer git checkout 6c11da1 -./autogen.sh || { +./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } [[ -f Makefile ]] || { - printf "Configure gstreamer failed, no Makefile generated!!!\n" - exit -1 + printf "Configure gstreamer failed, no Makefile generated!!!\n" + exit -1 } make clean make || { @@ -53,13 +49,13 @@ cd .. git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-base cd gst-plugins-base git checkout a8df760 -./autogen.sh || { +./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } [[ -f Makefile ]] || { - printf "Configure gst-plugins-base failed, no Makefile generated!!!\n" - exit -1 + printf "Configure gst-plugins-base failed, no Makefile generated!!!\n" + exit -1 } make clean make || { @@ -74,13 +70,13 @@ cd .. git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-good cd gst-plugins-good git checkout d14d4c4 -./autogen.sh --enable-experimental || { +./autogen.sh --enable-experimental --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } [[ -f Makefile ]] || { - printf "Configure gst-plugins-good failed, no Makefile generated!!!\n" - exit -1 + printf "Configure gst-plugins-good failed, no Makefile generated!!!\n" + exit -1 } make clean make || { @@ -95,13 +91,13 @@ cd .. git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly cd gst-plugins-ugly git checkout 68985ba -./autogen.sh || { +./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } [[ -f Makefile ]] || { - printf "Configure gst-plugins-ugly failed, no Makefile generated!!!\n" - exit -1 + printf "Configure gst-plugins-ugly failed, no Makefile generated!!!\n" + exit -1 } make clean make || { @@ -113,17 +109,17 @@ sudo make install || { exit -1 } cd .. -git clone https://github.com/duzy/gst-plugins-bad.git +git clone https://github.com/hyades/gst-plugins-bad.git cd gst-plugins-bad git checkout speakertrack_new -git checkout -./autogen.sh || { +git checkout +./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } [[ -f Makefile ]] || { - printf "Configure gst-plugins-bad failed, no Makefile generated!!!\n" - exit -1 + printf "Configure gst-plugins-bad failed, no Makefile generated!!!\n" + exit -1 } make clean make || { @@ -137,7 +133,7 @@ sudo make install || { cd .. git clone https://github.com/hyades/gst-switch.git cd gst-switch -./autogen.sh || { +./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 } @@ -150,5 +146,3 @@ sudo make install || { printf "make install of gstswitch failed!!!\n" exit -1 } -# sudo cp /usr/lib/girepository-1.0/*.* /usr/lib/girepository-1.0/ - From f93f7a774c997cb93f56e7982145d4e2700b7314 Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Thu, 19 Sep 2013 22:02:55 +0530 Subject: [PATCH 7/8] Update install.sh [ci skip] --- scripts/install.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 032490b..c457363 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,8 +5,7 @@ sudo pip install mock sudo pip install pytest-cov sudo pip install pytest-pep8 sudo pip install pylint -sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 -sudo apt-get -y install python-gi +sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 python-gi sudo apt-get -y install python-scipy ffmpeg sudo apt-get -y install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex export PKG_CONFIG_PATH=/usr/lib/pkgconfig/ @@ -111,8 +110,6 @@ sudo make install || { cd .. git clone https://github.com/hyades/gst-plugins-bad.git cd gst-plugins-bad -git checkout speakertrack_new -git checkout ./autogen.sh --prefix=/usr || { printf "Failed to do autogen!!!\n" exit -1 From ebf5d2226d4d6716a855c9c00913a1adf185f0e6 Mon Sep 17 00:00:00 2001 From: Aayush Ahuja Date: Thu, 19 Sep 2013 22:03:26 +0530 Subject: [PATCH 8/8] Update .travis-setup.sh --- .travis-setup.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis-setup.sh b/.travis-setup.sh index 81a1164..a2c7574 100644 --- a/.travis-setup.sh +++ b/.travis-setup.sh @@ -3,8 +3,7 @@ sudo apt-get update sudo pip install -r requirements.txt --use-mirrors sudo apt-get install ubuntu-desktop -sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 -sudo apt-get -y install python-gi +sudo apt-get -y install libglib2.0-dev gir1.2-glib-2.0 libgirepository1.0-dev libglib2.0-0 python-gi sudo apt-get -y install python-scipy ffmpeg sudo apt-get -y install autoconf automake autopoint libbz2-dev libdv4-dev libfaac-dev libfaad-dev libgtk-3-dev libmjpegtools-dev libtag1-dev libasound2-dev libtool libvpx-dev libxv-dev libx11-dev libogg-dev libvorbis-dev libopencv-dev libcv-dev libhighgui-dev libv4l-dev pkg-config zlib1g-dev gtk-doc-tools yasm bison flex export PKG_CONFIG_PATH=/usr/lib/pkgconfig/