Remove some old run/ scripts. Make server test build again.
authorCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 20:50:23 +0000 (21:50 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 29 Aug 2013 20:50:23 +0000 (21:50 +0100)
run/alignomatic [deleted file]
run/dvdomatic-osx [deleted file]
run/makedcp-osx [deleted file]
run/playomatic [deleted file]
run/servomatictest [deleted file]
src/tools/server_test.cc [new file with mode: 0644]
src/tools/servomatictest.cc [deleted file]
src/tools/test.cc [deleted file]
src/tools/wscript

diff --git a/run/alignomatic b/run/alignomatic
deleted file mode 100755 (executable)
index 9cc8c22..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/alignomatic $2
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/alignomatic $2
-else
-    build/src/tools/alignomatic "$1"
-fi
diff --git a/run/dvdomatic-osx b/run/dvdomatic-osx
deleted file mode 100755 (executable)
index 8fef27f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/dvdomatic "$*"
-elif [ "$1" == "--valgrind" ]; then
-    shift
-    valgrind --tool="memcheck" build/src/tools/dvdomatic $*
-elif [ "$1" == "--i18n" ]; then
-    shift
-    LANGUAGE=fr_FR.UTF8 LANG=fr_FR.UTF8 build/src/tools/dvdomatic "$*"
-else
-    build/src/tools/dvdomatic "$*"
-fi
diff --git a/run/makedcp-osx b/run/makedcp-osx
deleted file mode 100755 (executable)
index 03756f5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:build/src/lib:build/src:/Users/carl/Environments/osx/64/lib
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/makedcp "$@"
-elif [ "$1" == "--memcheck" ]; then
-    shift
-    valgrind --tool="memcheck" --leak-check=full --show-reachable=yes build/src/tools/makedcp "$@"
-elif [ "$1" == "--massif" ]; then
-    shift
-    valgrind --tool="massif" build/src/tools/makedcp "$@"
-else
-    build/src/tools/makedcp "$@"
-fi
diff --git a/run/playomatic b/run/playomatic
deleted file mode 100755 (executable)
index 9fe191a..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:build/src/gtk:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    gdb --args build/src/tools/playomatic $2
-elif [ "$1" == "--valgrind" ]; then
-    valgrind --tool="memcheck" build/src/tools/playomatic $2
-else
-    build/src/tools/playomatic "$1"
-fi
diff --git a/run/servomatictest b/run/servomatictest
deleted file mode 100755 (executable)
index 58cea88..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-export LD_LIBRARY_PATH=build/src/lib:$LD_LIBRARY_PATH
-if [ "$1" == "--debug" ]; then
-    shift
-    gdb --args build/src/tools/servomatictest $*
-elif [ "$1" == "--valgrind" ]; then
-    shift
-    valgrind --tool="memcheck" build/src/tools/servomatictest $*
-else
-    build/src/tools/servomatictest $*
-fi
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
new file mode 100644 (file)
index 0000000..029e626
--- /dev/null
@@ -0,0 +1,158 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program 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 General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <iostream>
+#include <iomanip>
+#include <exception>
+#include <getopt.h>
+#include "lib/ratio.h"
+#include "lib/film.h"
+#include "lib/filter.h"
+#include "lib/util.h"
+#include "lib/scaler.h"
+#include "lib/server.h"
+#include "lib/dcp_video_frame.h"
+#include "lib/decoder.h"
+#include "lib/exceptions.h"
+#include "lib/scaler.h"
+#include "lib/log.h"
+#include "lib/video_decoder.h"
+#include "lib/player.h"
+
+using std::cout;
+using std::cerr;
+using std::string;
+using std::pair;
+using boost::shared_ptr;
+
+static shared_ptr<Film> film;
+static ServerDescription* server;
+static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
+static int frame = 0;
+
+void
+process_video (shared_ptr<const Image> image, Eyes eyes, ColourConversion conversion, Time)
+{
+       shared_ptr<DCPVideoFrame> local  (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+       shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (image, frame, eyes, conversion, film->video_frame_rate(), 250000000, log_));
+
+       cout << "Frame " << frame << ": ";
+       cout.flush ();
+
+       ++frame;
+
+       shared_ptr<EncodedData> local_encoded = local->encode_locally ();
+       shared_ptr<EncodedData> remote_encoded;
+
+       string remote_error;
+       try {
+               remote_encoded = remote->encode_remotely (*server);
+       } catch (NetworkError& e) {
+               remote_error = e.what ();
+       }
+
+       if (!remote_error.empty ()) {
+               cout << "\033[0;31mnetwork problem: " << remote_error << "\033[0m\n";
+               return;
+       }
+
+       if (local_encoded->size() != remote_encoded->size()) {
+               cout << "\033[0;31msizes differ\033[0m\n";
+               return;
+       }
+               
+       uint8_t* p = local_encoded->data();
+       uint8_t* q = remote_encoded->data();
+       for (int i = 0; i < local_encoded->size(); ++i) {
+               if (*p++ != *q++) {
+                       cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
+                       return;
+               }
+       }
+
+       cout << "\033[0;32mgood\033[0m\n";
+}
+
+static void
+help (string n)
+{
+       cerr << "Syntax: " << n << " [--help] --film <film> --server <host>\n";
+       exit (EXIT_FAILURE);
+}
+
+int
+main (int argc, char* argv[])
+{
+       string film_dir;
+       string server_host;
+
+       while (1) {
+               static struct option long_options[] = {
+                       { "help", no_argument, 0, 'h'},
+                       { "server", required_argument, 0, 's'},
+                       { "film", required_argument, 0, 'f'},
+                       { 0, 0, 0, 0 }
+               };
+
+               int option_index = 0;
+               int c = getopt_long (argc, argv, "hs:f:", long_options, &option_index);
+
+               if (c == -1) {
+                       break;
+               }
+
+               switch (c) {
+               case 'h':
+                       help (argv[0]);
+                       exit (EXIT_SUCCESS);
+               case 's':
+                       server_host = optarg;
+                       break;
+               case 'f':
+                       film_dir = optarg;
+                       break;
+               }
+       }
+       
+       if (server_host.empty() || film_dir.empty()) {
+               help (argv[0]);
+               exit (EXIT_FAILURE);
+       }
+
+       dcpomatic_setup ();
+
+       server = new ServerDescription (server_host, 1);
+       film.reset (new Film (film_dir));
+       film->read_metadata ();
+
+       shared_ptr<Player> player = film->make_player ();
+       player->disable_audio ();
+
+       try {
+               player->Video.connect (boost::bind (process_video, _1, _2, _3, _5));
+               bool done = false;
+               while (!done) {
+                       done = player->pass ();
+               }
+       } catch (std::exception& e) {
+               cerr << "Error: " << e.what() << "\n";
+       }
+
+       return 0;
+}
diff --git a/src/tools/servomatictest.cc b/src/tools/servomatictest.cc
deleted file mode 100644 (file)
index 88974ee..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <iostream>
-#include <iomanip>
-#include <exception>
-#include <getopt.h>
-#include "format.h"
-#include "film.h"
-#include "filter.h"
-#include "util.h"
-#include "scaler.h"
-#include "server.h"
-#include "dcp_video_frame.h"
-#include "decoder.h"
-#include "exceptions.h"
-#include "scaler.h"
-#include "log.h"
-#include "video_decoder.h"
-#include "player.h"
-
-using std::cout;
-using std::cerr;
-using std::string;
-using std::pair;
-using boost::shared_ptr;
-
-static ServerDescription* server;
-static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
-static int frame = 0;
-
-void
-process_video (shared_ptr<const Image> image, bool, shared_ptr<Subtitle> sub)
-{
-       shared_ptr<DCPVideoFrame> local (
-               new DCPVideoFrame (
-                       image, sub,
-                       libdcp::Size (1024, 1024), 0, 0, 0,
-                       Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
-               );
-       
-       shared_ptr<DCPVideoFrame> remote (
-               new DCPVideoFrame (
-                       image, sub,
-                       libdcp::Size (1024, 1024), 0, 0, 0,
-                       Scaler::from_id ("bicubic"), frame, 24, "", 0, 250000000, log_)
-               );
-
-       cout << "Frame " << frame << ": ";
-       cout.flush ();
-
-       ++frame;
-
-       shared_ptr<EncodedData> local_encoded = local->encode_locally ();
-       shared_ptr<EncodedData> remote_encoded;
-
-       string remote_error;
-       try {
-               remote_encoded = remote->encode_remotely (server);
-       } catch (NetworkError& e) {
-               remote_error = e.what ();
-       }
-
-       if (!remote_error.empty ()) {
-               cout << "\033[0;31mnetwork problem: " << remote_error << "\033[0m\n";
-               return;
-       }
-
-       if (local_encoded->size() != remote_encoded->size()) {
-               cout << "\033[0;31msizes differ\033[0m\n";
-               return;
-       }
-               
-       uint8_t* p = local_encoded->data();
-       uint8_t* q = remote_encoded->data();
-       for (int i = 0; i < local_encoded->size(); ++i) {
-               if (*p++ != *q++) {
-                       cout << "\033[0;31mdata differ\033[0m at byte " << i << "\n";
-                       return;
-               }
-       }
-
-       cout << "\033[0;32mgood\033[0m\n";
-}
-
-static void
-help (string n)
-{
-       cerr << "Syntax: " << n << " [--help] --film <film> --server <host>\n";
-       exit (EXIT_FAILURE);
-}
-
-int
-main (int argc, char* argv[])
-{
-       string film_dir;
-       string server_host;
-
-       while (1) {
-               static struct option long_options[] = {
-                       { "help", no_argument, 0, 'h'},
-                       { "server", required_argument, 0, 's'},
-                       { "film", required_argument, 0, 'f'},
-                       { 0, 0, 0, 0 }
-               };
-
-               int option_index = 0;
-               int c = getopt_long (argc, argv, "hs:f:", long_options, &option_index);
-
-               if (c == -1) {
-                       break;
-               }
-
-               switch (c) {
-               case 'h':
-                       help (argv[0]);
-                       exit (EXIT_SUCCESS);
-               case 's':
-                       server_host = optarg;
-                       break;
-               case 'f':
-                       film_dir = optarg;
-                       break;
-               }
-       }
-       
-       if (server_host.empty() || film_dir.empty()) {
-               help (argv[0]);
-               exit (EXIT_FAILURE);
-       }
-
-       dcpomatic_setup ();
-
-       server = new ServerDescription (server_host, 1);
-       shared_ptr<Film> film (new Film (film_dir));
-       film->read_metadata ();
-
-       shared_ptr<Player> player = film->player ();
-       player->disable_audio ();
-
-       try {
-               player->Video.connect (boost::bind (process_video, _1, _2, _3));
-               bool done = false;
-               while (!done) {
-                       done = player->pass ();
-               }
-       } catch (std::exception& e) {
-               cerr << "Error: " << e.what() << "\n";
-       }
-
-       return 0;
-}
diff --git a/src/tools/test.cc b/src/tools/test.cc
deleted file mode 100644 (file)
index 4baaeb7..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program 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 General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
-
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
-#include "image.h"
-#include "server.h"
-
-using namespace boost;
-
-int main ()
-{
-       uint8_t* rgb = new uint8_t[256];
-       shared_ptr<Image> image (new Image (rgb, 0, 32, 32, 24));
-       Server* s = new Server ("localhost", 2);
-       image->encode_remotely (s);
-       return 0;
-}
index c7ab4460401ef99656ddacdbd11edcd2576038db..42fc90adbeac9e073f7ab101fcd5eef6c40141dd 100644 (file)
@@ -4,7 +4,7 @@ from waflib import Logs
 import i18n
 
 def build(bld):
-    for t in ['dcpomatic_cli', 'dcpomatic_server_cli']:
+    for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test']:
         obj = bld(features = 'cxx cxxprogram')
         obj.uselib = 'BOOST_THREAD OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS'
         obj.includes = ['..']