Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: plugorgau/eventstreamr
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: linuxaustralia/eventstreamr
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jun 9, 2014

  1. Copy the full SHA
    c0da567 View commit details
  2. Copy the full SHA
    1587aa7 View commit details
  3. Create jsonparsing.py

    My magic foo
    colmiga committed Jun 9, 2014
    Copy the full SHA
    dc4ce8e View commit details
  4. add a vlc command

    matheist76 committed Jun 9, 2014
    Copy the full SHA
    6846429 View commit details
  5. Copy the full SHA
    468362b View commit details
  6. q-mgr.py now has cut list

    matheist76 committed Jun 9, 2014
    Copy the full SHA
    f48c349 View commit details

Commits on Jun 10, 2014

  1. Created a lwn-test.json file that matches with what we recorded last …

    …Saturday. It contains the presenter field which the other test json files didn't.
    matheist76 committed Jun 10, 2014
    Copy the full SHA
    62d67c8 View commit details
  2. Copy the full SHA
    6a701f9 View commit details
  3. Copy the full SHA
    4e30af3 View commit details
  4. Copy the full SHA
    3f22488 View commit details
  5. Copy the full SHA
    8aaa785 View commit details
  6. Copy the full SHA
    40380a8 View commit details
  7. Copy the full SHA
    27ac75c View commit details
  8. remove .swps

    krman committed Jun 10, 2014
    Copy the full SHA
    89f584e View commit details

Commits on Jun 11, 2014

  1. Copy the full SHA
    921d919 View commit details
  2. Copy the full SHA
    3cd2f98 View commit details
  3. Copy the full SHA
    5cac31a View commit details

Commits on Jun 12, 2014

  1. * Initial mlt file creation complete

     * New perl script to just create title image since we can't find a python library that scales text well
    matheist76 committed Jun 12, 2014
    Copy the full SHA
    73495b6 View commit details
  2. Copy the full SHA
    64cb282 View commit details
  3. * Re-organise into modules and functions

     * Initial work on time parsing
    matheist76 committed Jun 12, 2014
    Copy the full SHA
    186886f View commit details

Commits on Jun 14, 2014

  1. Copy the full SHA
    e4876c0 View commit details
  2. Copy the full SHA
    e10d5f0 View commit details
  3. Copy the full SHA
    648ffe3 View commit details
  4. Merge pull request #1 from krman/duration

    Duration
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    f097672 View commit details
  5. Merge pull request #2 from matheist76/cleanup

    Lots of work to rewrite  gen_encode.pl as q-mgr.py
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    0364df3 View commit details
  6. Merge branch 'cleanup'

     message to explain why this merge is necessary,
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    39b600b View commit details
  7. Merge pull request #3 from matheist76/cleanup

    Cleanup
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    e86891f View commit details
  8. Copy the full SHA
    8e9eba5 View commit details
  9. Added the duration func to lib/duration.py.

    Added a new string format str2delta to deal with getting the duration
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    5782cdb View commit details
  10. Merge pull request #4 from matheist76/dur8tion

    Dur8tion
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    81292a9 View commit details
  11. remove references to wand

    krman committed Jun 14, 2014
    Copy the full SHA
    212423a View commit details
  12. Merge pull request #5 from krman/cleanup

    remove references to wand
    krman committed Jun 14, 2014
    Copy the full SHA
    1c20d37 View commit details
  13. Copy the full SHA
    316d7a6 View commit details
  14. Copy the full SHA
    8f4107e View commit details
  15. use get_duration in q-mgr.py

    krman committed Jun 14, 2014
    Copy the full SHA
    d72ac03 View commit details
  16. Copy the full SHA
    dec154a View commit details
  17. add %S format to str2delta

    krman committed Jun 14, 2014
    Copy the full SHA
    a6c73f1 View commit details
  18. Copy the full SHA
    1436524 View commit details
  19. Merge pull request #7 from krman/prompt-time

    Prompt time
    iseppi committed Jun 14, 2014
    Copy the full SHA
    6e2168a View commit details
  20. Copy the full SHA
    b2a0a15 View commit details
  21. Copy the full SHA
    beeaf22 View commit details
  22. * Fix up directory variables at start of file

     * Don't use the word buffer as a variable name
     * Delete unused image creation code
     * Move DEVNULL file handle to be closer to call to vlc and ensure we close it
    iseppi committed Jun 14, 2014
    Copy the full SHA
    6cb9873 View commit details
  23. Merge pull request #8 from iseppi/more-cleanup

    More cleanup
    iseppi committed Jun 14, 2014
    Copy the full SHA
    866da08 View commit details
  24. * Remove old queue-mgr.pl

      * Add new q-run.py
    iseppi committed Jun 14, 2014
    Copy the full SHA
    c57dfe5 View commit details
  25. Merge pull request #9 from iseppi/q-run

    Add new Q runner
    iseppi committed Jun 14, 2014
    Copy the full SHA
    71130f6 View commit details
  26. * Grab stderr as part of starting the subprocess.

     * Use the right variable to refer to a job in move_job()
    iseppi committed Jun 14, 2014
    Copy the full SHA
    8d62ff8 View commit details
  27. Copy the full SHA
    e0746f3 View commit details
  28. Merge pull request #10 from iseppi/fix-qrun

    Bug fixes in q-run.py
    iseppi committed Jun 14, 2014
    Copy the full SHA
    59a69b1 View commit details
  29. Merge pull request #11 from matheist76/q-run

    Fix up melt command with a generic filenam
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    2fc643b View commit details
  30. renamed mlt.py to job.py

    implement create title
    matheist76 committed Jun 14, 2014
    Copy the full SHA
    a992a61 View commit details
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.pyc
encoding/test
2 changes: 1 addition & 1 deletion baseimage/configure-host.sh
Original file line number Diff line number Diff line change
@@ -191,7 +191,7 @@ sed -i "s/${existing}/${hostname}/g" /etc/hostname


echo "- updating /etc/rc.local to start eventstreamr bits"
cp $IMAGE/rc.local /etc/rc.local
cp $IMAGE/upstart/station-mgr.conf /etc/init/station-mgr.conf

echo "- fix grub"
/usr/sbin/grub-install /dev/sda
43 changes: 43 additions & 0 deletions baseimage/packages-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#!/bin/bash

# This script sets up an Ubuntu Linux installation with the correct packages, building them from source if necessary.

rm -r ~/eventstreamr

## Comment out the source archives
sed -i 's/deb-src/#deb-src/g' /etc/apt/sources.list

## APT remove unneeded stuff and get needed stuff
apt-get update
apt-get dist-upgrade -y
apt-get install -y ubuntu-desktop
apt-get remove --purge -y ffmpeg unity-lens-shopping unity-scope-musicstores whoopsie example-content libreoffice-common shotwell thunderbird evolution-data-server
apt-get autoremove --purge -y
apt-get install -y openssh-server build-essential vlc xchat mumble melt vim libdbd-mysql-perl libdbd-pg-perl indicator-multiload dvgrab tmux iotop git cmake libgtkmm-2.4-dev libboost1.54-all-dev libjack-dev liblo-dev libasound2-dev libxv-dev curl autoconf automake build-essential libass-dev libtheora-dev libopus-dev libtool libvorbis-dev yasm libx264-dev libfdk-aac-dev libmp3lame-dev libopus-dev libvpx-dev libdancer-perl libipc-shareable-perl libproc-daemon-perl libjson-perl libconfig-json-perl libproc-processtable-perl libfile-slurp-perl libmoo-perl libhash-merge-simple-perl liblog-log4perl-perl libfile-readbackwards-perl libhttp-tiny-perl nodejs-legacy libfile-rsync-perl libanyevent-perl liblinux-inotify2-perl libfreetype6-dev libgpac-dev libtool pkg-config opus-tools cmake guake plymouth-theme-ubuntu-logo

## Get the latest eventstreamr
cd ~
git clone https://github.com/linuxaustralia/eventstreamr eventstreamr

## Setup ffmpeg
mkdir -p ~/eventstreamr/baseimage/src
cd ~/eventstreamr/baseimage/src
git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg
cd ffmpeg
./configure --enable-gpl \
--enable-libass --enable-libfdk-aac --enable-libfreetype --enable-libmp3lame --enable-libopus \
--enable-libtheora --enable-libvorbis --enable-libvpx --enable-libx264 --enable-nonfree --enable-shared --disable-static
make
make install
make distclean
ldconfig

## Setup DVSwitch
cd ..
wget "https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=dvswitch/dvswitch.git;a=snapshot;h=1f98a6d22b18fa080b38e2abee3b2202807633d4;sf=tgz" -O dvswitch.tar.gz
tar -xvf dvswitch.tar.gz
cd dvswitch-1f98a6d
make
make install
make clean
chown -R av: ~/eventstreamr
14 changes: 14 additions & 0 deletions baseimage/upstart/station-mgr.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Ubuntu upstart file at /etc/init/station-mgr.conf

#respawn # This does not work properly for the current script
#respawn limit 15 5

start on runlevel [2345]
stop on runlevel [06]

script
export EVENTSTREAMR="/home/av/eventstreamr"
export DISPLAY=":0"
su - av -c "cd $EVENTSTREAMR/baseimage; ./update-wallpaper.sh"
su - av -c "perl $EVENTSTREAMR/station/bin/station-mgr.pl"
end script
7 changes: 7 additions & 0 deletions encoding/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Encoding and queue management
=============================
q-mgr.py - Used to parse schedule data, mark start/end cuts, and create encode jobs
q-run.py - Used to execute encode jobs
gen_image.pl - Creates a text based png for titles and credits in videos


youtube uploader
================

4 changes: 4 additions & 0 deletions encoding/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"base_dir": "test",
"schedule": "lwn-test.json"
}
270 changes: 0 additions & 270 deletions encoding/gen_encode.pl

This file was deleted.

23 changes: 23 additions & 0 deletions encoding/gen_image.pl
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/perl

use v5.14;
use Image::Magick;

my $self;
$self->{title_output} = $ARGV[0];
$self->{title_text} = $ARGV[1];
create_title();

sub create_title {
my $im;
$im = new Image::Magick;

$im->Set( size => '768x200' );
$im->ReadImage("./blank_title.png");

my $label=Image::Magick->new(size=>"700x200");
$label->Set(gravity => "Center", font => '/usr/share/fonts/truetype/ubuntu-font-family/Ubuntu-B.ttf', background => 'none', fill => 'white');
$label->Read("label:$self->{title_text}");
$im->Composite(image => $label, gravity => 'Center');
$im->Write("$self->{title_output}");
}
5 changes: 5 additions & 0 deletions encoding/lib/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import duration
import job
import schedule
import ui
import youtube
Loading