Move some tests and rename one set.

[libdcp.git] / test / bench.cc

diff --git a/test/bench.cc b/test/bench.cc
index e76b3a970202c099d8229890a0106e71a5a7a569..cfda461254bfe01a4f0edf25dadd6108d59331a6 100644 (file)
--- a/test/bench.cc
+++ b/test/bench.cc
@@ -1,20 +1,34 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "data.h"
@@ -23,9 +37,9 @@
 #include "version.h"
 #include "j2k.h"
 #include "openjpeg_image.h"
-#include <openjpeg.h>
 #include <sys/time.h>
 #include <iostream>
+#include <cstdio>
 
 using std::cout;
 using std::cerr;
@@ -49,7 +63,7 @@ public:
        {
                struct timeval stop;
                gettimeofday (&stop, 0);
-               _total += (stop.tv_sec + stop.tv_usec / 1000000) - (_start.tv_sec + _start.tv_usec / 1000000);
+               _total += (stop.tv_sec + stop.tv_usec / 1e6) - (_start.tv_sec + _start.tv_usec / 1e6);
        }
 
        double get ()
@@ -71,7 +85,7 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
-       int const count = 50;
+       int const count = 100;
        int const j2k_bandwidth = 100000000;
 
        dcp::Data j2k (boost::filesystem::path (argv[1]) / "thx.j2c");
@@ -96,6 +110,6 @@ main (int argc, char* argv[])
        cout << "Compress:   " << count / compress.get() << " fps.\n";
 
        FILE* f = fopen ("check.j2c", "wb");
-       fwrite (recomp.data.get(), 1, recomp.size, f);
+       fwrite (recomp.data().get(), 1, recomp.size(), f);
        fclose (f);
 }