Merge branch 'feature/issue15' into develop

Also fix for #7

Vagrantfile

@@ -4,6 +4,8 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+Vagrant.require_version ">= 1.6.3"
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
@@ -19,7 +21,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
-  config.vm.network :forwarded_port, guest: 80, host: 9080
+  config.vm.network "forwarded_port", guest: 80, host: 9080
+
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -44,13 +47,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
   #
-  # config.vm.provider :virtualbox do |vb|
+  config.vm.provider :virtualbox do |vb|
   #   # Don't boot with headless mode
   #   vb.gui = true
   #
   #   # Use VBoxManage to customize the VM. For example to change memory:
   #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
+  end
   #
   # View the documentation for the provider you're using for more
   # information on available options.
@@ -90,7 +93,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     chef.add_recipe "build-essential"
     chef.add_recipe "git"
     chef.add_recipe "ohai"
-    chef.add_recipe "iptables"
+#    chef.add_recipe "iptables"
     chef.add_recipe "apache2"
     chef.add_recipe "nginx"
     chef.add_recipe "yum"

humble-video-chef/cookbooks/humble-ubuntu-development/recipes/default.rb

@@ -2,39 +2,58 @@
 # Cookbook Name:: humble_development
 # Recipe:: default
 #
-# Copyright 2013, Humble Software
+# Copyright 2014, Humble Software
 #
 # All rights reserved - Do Not Redistribute
 #
+#
+apt_repository "saucy" do
+   uri "http://ubuntu.mirror.cambrium.nl/ubuntu/" 
+   distribution "saucy"
+   components ["main"]
+end
 
 package "autoconf" do
+  version "2.69-1.1"
   action :upgrade
 end
-package "automake" do
+package "automake" do   
+  version "1:1.13.3-1.1ubuntu2"
   action :upgrade
 end
+apt_repository "saucy" do
+   action :remove
+end
 package "libtool" do
+  version "2.4.2-1ubuntu1"
   action :upgrade
 end
 package "pkg-config" do
+  version "0.26-1ubuntu1"
   action :upgrade
 end
 package "gcc-multilib" do
+  version "4:4.6.3-1ubuntu5"
   action :upgrade
 end
 package "g++-multilib" do
+  version "4:4.6.3-1ubuntu5"
   action :upgrade
 end
 package "mingw-w64" do
+  version "2.0.1-1"
   action :upgrade
 end
 package "g++-mingw-w64" do
+  version "4.6.3-1ubuntu5+5ubuntu1"
   action :upgrade
 end
 package "gcc-mingw-w64" do
+  version "4.6.3-1ubuntu5+5ubuntu1"
   action :upgrade
 end
 package "binutils-mingw-w64" do
+  version "2.22-2ubuntu1+1"
   action :upgrade
 end
 # There is a bug in virtualbox that cause 'strip' of a '.dll' file
@@ -70,17 +89,22 @@
   not_if {File.exists?("/usr/bin/i686-w64-mingw32-strip")}
 end
 package "doxygen" do
+  version "1.7.6.1-2ubuntu1"
   action :upgrade
 end
 package "valgrind" do
+  version "1.3.7.0-0"
   action :upgrade
 end
 package "graphviz" do
+  version "2.26.3-10"
   action :upgrade
 end
 package "maven" do
+  version "3.0.4-2"
   action :upgrade
 end
 package "libpcre3-dev" do
+  version "8.12-4"
   action :upgrade
 end

humble-video-noarch/src/test/java/io/humble/video/FilterGraphTest.java

@@ -175,7 +175,7 @@ public void testFilterAudio() throws InterruptedException, IOException {
          bytesRead = decoder.decodeAudio(audio, packet, byteOffset);
          byteOffset += bytesRead;
          filterSource.addAudio(audio);
-         while(filterSink.getAudio(filteredAudio)>= 0)
+         while(filterSink.getAudio(filteredAudio)>= 0 && filteredAudio.isComplete())
          {         
            rawAudio = converter.toJavaAudio(rawAudio, filteredAudio);
            if (audioFrame != null) 
@@ -189,7 +189,7 @@ public void testFilterAudio() throws InterruptedException, IOException {
       bytesRead = decoder.decodeAudio(audio, null, 0);
       if (audio.isComplete()) {
         filterSource.addAudio(audio);
-        while(filterSink.getAudio(filteredAudio)>= 0)
+        while(filterSink.getAudio(filteredAudio)>= 0 && filteredAudio.isComplete())
         {         
           rawAudio = converter.toJavaAudio(rawAudio, filteredAudio);
           if (audioFrame != null) 

humble-video-parent/pom.xml

@@ -30,7 +30,8 @@
   </license>
  </licenses>
  <scm>
-  <url>https://github.com/artclarke/humble-video-main</url>
+  <url>https://github.com/artclarke/humble-video</url>
+  <connection>scm:git:git://github.com/artclarke/humble-video.git</connection>
  </scm>
  <developers>
   <developer>
@@ -92,8 +93,12 @@
     <plugin>
      <groupId>org.apache.maven.plugins</groupId>
      <artifactId>maven-surefire-plugin</artifactId>
-     <version>2.15</version>
+     <version>2.17</version>
      <configuration>
+      <useSystemClassLoader>false</useSystemClassLoader>
+      <systemProperties>
+        <java.awt.headless>true</java.awt.headless>
+      </systemProperties>
       <forkCount>1</forkCount>
       <reuseForks>false</reuseForks>
       <workingDirectory>${basedir}/target/test-workingdir</workingDirectory>
@@ -170,7 +175,7 @@
    <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-surefire-report-plugin</artifactId>
-    <version>2.15</version>
+    <version>2.17</version>
    </plugin>
   </plugins>
  </reporting>