26d4079c0a1eb010b0909e8f046f04381408b6f3 from master; half-hearted --dump option...

diff --git a/TO_PORT b/TO_PORT
index 035082c0b2fbb44d49b556520e3098d30fd9901e..6a40df8a88703ba0f7e52e03ed4a6065bb6a455f 100644 (file)
--- a/TO_PORT
+++ b/TO_PORT
@@ -1,3 +1 @@
-f952568be9c4438d5b024c133b18b2590de968e7
-77d7a03cf0785140caf37276edac9a1a0c9a8799
 26d4079c0a1eb010b0909e8f046f04381408b6f3

diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index e414436e8b39960c6c5f78ca16188c0781bc0407..8111dde5f578023713034c2bc7ce4e3540484491 100644 (file)
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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

diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 36929db36434f8929de3f7ffd3fad95accf0d1e4..54e196fe0acb4d5e6a0b9ab343ef46c63ad91bb2 100644 (file)
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -17,10 +17,6 @@
 
 */
 
-#include <iostream>
-#include <iomanip>
-#include <getopt.h>
-#include <dcp/version.h>
 #include "lib/film.h"
 #include "lib/filter.h"
 #include "lib/transcode_job.h"
@@ -33,6 +29,13 @@
 #include "lib/signal_manager.h"
 #include "lib/server_finder.h"
 #include "lib/json_server.h"
+#include "lib/ratio.h"
+#include "lib/audio_content.h"
+#include <dcp/version.h>
+#include <boost/foreach.hpp>
+#include <getopt.h>
+#include <iostream>
+#include <iomanip>
 
 using std::string;
 using std::cerr;
@@ -42,6 +45,7 @@ using std::pair;
 using std::list;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 
 static void
 help (string n)
@@ -54,10 +58,59 @@ help (string n)
             << "  -r, --no-remote    do not use any remote servers\n"
             << "  -j, --json <port>  run a JSON server on the specified port\n"
             << "  -k, --keep-going   keep running even when the job is complete\n"
+            << "      --dump         just dump a summary of the film's settings; don't encode\n"
             << "\n"
             << "<FILM> is the film directory.\n";
 }
 
+static void
+print_dump (shared_ptr<Film> film)
+{
+       cout << film->dcp_name (true) << "\n"
+            << film->container()->nickname() << " at " << ((film->resolution() == RESOLUTION_2K) ? "2K" : "4K") << "\n"
+            << (film->j2k_bandwidth() / 1000000) << "Mbit/s" << "\n"
+            << "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n"
+            << (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n";
+
+       BOOST_FOREACH (shared_ptr<Content> c, film->content ()) {
+               cout << "\n"
+                    << c->path(0) << "\n"
+                    << "\tat " << c->position().seconds ()
+                    << " length " << c->full_length().seconds ()
+                    << " start trim " << c->trim_start().seconds ()
+                    << " end trim " << c->trim_end().seconds () << "\n";
+
+               shared_ptr<VideoContent> video = dynamic_pointer_cast<VideoContent> (c);
+               if (video) {
+                       cout << "\t" << video->video_size().width << "x" << video->video_size().height << "\n"
+                            << "\t" << video->video_frame_rate() << "fps\n"
+                            << "\tcrop left " << video->left_crop()
+                            << " right " << video->right_crop()
+                            << " top " << video->top_crop()
+                            << " bottom " << video->bottom_crop() << "\n"
+                            << "\tscale " << video->scale().name() << "\n";
+                       if (video->colour_conversion()) {
+                               if (video->colour_conversion().get().preset()) {
+                                       cout << "\tcolour conversion "
+                                            << PresetColourConversion::all()[video->colour_conversion().get().preset().get()].name
+                                            << "\n";
+                               } else {
+                                       cout << "\tcustom colour conversion\n";
+                               }
+                       } else {
+                               cout << "\tno colour conversion\n";
+                       }
+                                       
+               }
+
+               shared_ptr<AudioContent> audio = dynamic_pointer_cast<AudioContent> (c);
+               if (audio) {
+                       cout << "\t" << audio->audio_delay() << " delay\n"
+                            << "\t" << audio->audio_gain() << " gain\n";
+               }
+       }
+}
+
 int
 main (int argc, char* argv[])
 {
@@ -66,6 +119,7 @@ main (int argc, char* argv[])
        bool no_remote = false;
        optional<int> json_port;
        bool keep_going = false;
+       bool dump = false;
 
        int option_index = 0;
        while (true) {
@@ -77,10 +131,12 @@ main (int argc, char* argv[])
                        { "no-remote", no_argument, 0, 'r'},
                        { "json", required_argument, 0, 'j'},
                        { "keep-going", no_argument, 0, 'k' },
+                       /* Just using A, B, C ... from here on */
+                       { "dump", no_argument, 0, 'A' },
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "vhfnrj:k", long_options, &option_index);
+               int c = getopt_long (argc, argv, "vhfnrj:kA", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -108,6 +164,9 @@ main (int argc, char* argv[])
                case 'k':
                        keep_going = true;
                        break;
+               case 'A':
+                       dump = true;
+                       break;
                }
        }
 
@@ -138,6 +197,11 @@ main (int argc, char* argv[])
                exit (EXIT_FAILURE);
        }
 
+       if (dump) {
+               print_dump (film);
+               exit (EXIT_SUCCESS);
+       }
+       
        ContentList content = film->content ();
        for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
                vector<boost::filesystem::path> paths = (*i)->paths ();