X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=tools%2Fdcpinfo.cc;h=7b615deebad7f6e6105925dbf4d9848e7e44a015;hb=623e1979815d1282b4a4ce5fadf8e8a6e93a8368;hp=c69de8a7badd4acbd7aad149019bba72fb9e5b6c;hpb=8d0dde19b1a055b8a6341045c025a95273f06186;p=libdcp.git diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc index c69de8a7..7b615dee 100644 --- a/tools/dcpinfo.cc +++ b/tools/dcpinfo.cc @@ -1,72 +1,112 @@ /* Copyright (C) 2012-2014 Carl Hetherington - 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 . + + 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 -#include -#include -#include #include "dcp.h" #include "exceptions.h" #include "reel.h" -#include "sound_mxf.h" -#include "picture_mxf.h" -#include "subtitle_content.h" +#include "sound_asset.h" +#include "picture_asset.h" +#include "subtitle_asset.h" #include "reel_picture_asset.h" #include "reel_sound_asset.h" #include "reel_subtitle_asset.h" #include "subtitle_string.h" +#include "interop_subtitle_asset.h" +#include "smpte_subtitle_asset.h" #include "cpl.h" +#include "common.h" +#include +#include +#include +#include +#include using std::string; using std::cerr; using std::cout; using std::list; using boost::shared_ptr; +using boost::dynamic_pointer_cast; using namespace dcp; static void help (string n) { - cerr << "Syntax: " << n << " [options] \n" - << " -s, --subtitles list all subtitles\n" - << " -k, --keep-going carry on in the event of errors, if possible\n"; + cerr << "Syntax: " << n << " [options] [] []\n" + << " -s, --subtitles list all subtitles\n" + << " -k, --keep-going carry on in the event of errors, if possible\n" + << " --ignore-missing-assets ignore missing asset files\n"; } static void main_picture (shared_ptr reel) { - if (reel->main_picture() && reel->main_picture()->mxf()) { - cout << " Picture: " - << reel->main_picture()->mxf()->size().width - << "x" - << reel->main_picture()->mxf()->size().height << "\n"; + if (reel->main_picture()) { + cout << " Picture ID: " << reel->main_picture()->id() + << " entry " << reel->main_picture()->entry_point() + << " duration " << reel->main_picture()->duration() + << " intrinsic " << reel->main_picture()->intrinsic_duration(); + if (reel->main_picture()->asset_ref().resolved()) { + if (reel->main_picture()->asset()) { + cout << "\n Picture: " + << reel->main_picture()->asset()->size().width + << "x" + << reel->main_picture()->asset()->size().height << "\n"; + } + } else { + cout << " - not present in this DCP.\n"; + } } } static void main_sound (shared_ptr reel) { - if (reel->main_sound() && reel->main_sound()->mxf()) { - cout << " Sound: " - << reel->main_sound()->mxf()->channels() - << " channels at " - << reel->main_sound()->mxf()->sampling_rate() << "Hz\n"; + if (reel->main_sound()) { + cout << " Sound ID: " << reel->main_sound()->id() + << " entry " << reel->main_picture()->entry_point() + << " duration " << reel->main_picture()->duration() + << " intrinsic " << reel->main_picture()->intrinsic_duration(); + if (reel->main_sound()->asset_ref().resolved()) { + if (reel->main_sound()->asset()) { + cout << "\n Sound: " + << reel->main_sound()->asset()->channels() + << " channels at " + << reel->main_sound()->asset()->sampling_rate() << "Hz\n"; + } + } else { + cout << " - not present in this DCP.\n"; + } } } @@ -76,26 +116,27 @@ main_subtitle (shared_ptr reel, bool list_subtitles) if (!reel->main_subtitle()) { return; } - - list > subs = reel->main_subtitle()->subtitle_content()->subtitles (); - cout << " Subtitle: " << subs.size() << " subtitles in " << reel->main_subtitle()->subtitle_content()->language() << "\n"; - if (list_subtitles) { - for (list >::const_iterator k = subs.begin(); k != subs.end(); ++k) { - cout << " " << (*k)->text() << "\n"; - cout << " " - << "font:" << (*k)->font() << "; " - << "italic:" << (*k)->italic() << "; " - << "color:" << (*k)->color() << "; " - << "in:" << (*k)->in() << "; " - << "out:" << (*k)->out() << "; " - << "v_position:" << (*k)->v_position() << "; " - << "v_align:" << (*k)->v_align() << "; " - << "effect:" << (*k)->effect() << "; " - << "effect_color:" << (*k)->effect_color() << "; " - << "fade_up_time:" << (*k)->fade_up_time() << "; " - << "fade_down_time:" << (*k)->fade_down_time() << "; " - << "size: " << (*k)->size() << "\n"; + + cout << " Subtitle ID: " << reel->main_subtitle()->id(); + + if (reel->main_subtitle()->asset_ref().resolved()) { + list subs = reel->main_subtitle()->asset()->subtitles (); + cout << "\n Subtitle: " << subs.size() << " subtitles"; + shared_ptr iop = dynamic_pointer_cast (reel->main_subtitle()->asset()); + if (iop) { + cout << " in " << iop->language() << "\n"; + } + shared_ptr smpte = dynamic_pointer_cast (reel->main_subtitle()->asset()); + if (smpte && smpte->language ()) { + cout << " in " << smpte->language().get() << "\n"; + } + if (list_subtitles) { + BOOST_FOREACH (SubtitleString const& k, subs) { + cout << k << "\n"; + } } + } else { + cout << " - not present in this DCP.\n"; } } @@ -104,18 +145,20 @@ main (int argc, char* argv[]) { bool subtitles = false; bool keep_going = false; - + bool ignore_missing_assets = false; + int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { - { "version", no_argument, 0, 'v'}, - { "help", no_argument, 0, 'h'}, - { "subtitles", no_argument, 0, 's'}, - { "keep-going", no_argument, 0, 'k'}, + { "version", no_argument, 0, 'v' }, + { "help", no_argument, 0, 'h' }, + { "subtitles", no_argument, 0, 's' }, + { "keep-going", no_argument, 0, 'k' }, + { "ignore-missing-assets", no_argument, 0, 'A' }, { 0, 0, 0, 0 } }; - int c = getopt_long (argc, argv, "vhsk", long_options, &option_index); + int c = getopt_long (argc, argv, "vhskA", long_options, &option_index); if (c == -1) { break; @@ -123,7 +166,7 @@ main (int argc, char* argv[]) switch (c) { case 'v': - cout << "dcpdiff version " << LIBDCP_VERSION << "\n"; + cout << "libdcp version " << LIBDCP_VERSION << "\n"; exit (EXIT_SUCCESS); case 'h': help (argv[0]); @@ -134,6 +177,9 @@ main (int argc, char* argv[]) case 'k': keep_going = true; break; + case 'A': + ignore_missing_assets = true; + break; } } @@ -143,65 +189,77 @@ main (int argc, char* argv[]) } if (!boost::filesystem::exists (argv[optind])) { - cerr << argv[0] << ": DCP " << argv[optind] << " not found.\n"; + cerr << argv[0] << ": DCP or CPL " << argv[optind] << " not found.\n"; exit (EXIT_FAILURE); } - DCP* dcp = 0; - list errors; - try { - dcp = new DCP (argv[optind]); - dcp->read (keep_going, &errors); - } catch (FileError& e) { - cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n"; - exit (EXIT_FAILURE); - } catch (DCPReadError& e) { - cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n"; - exit (EXIT_FAILURE); - } - - cout << "DCP: " << boost::filesystem::path(argv[optind]).filename().string() << "\n"; + list > cpls; + if (boost::filesystem::is_directory(argv[optind])) { + DCP* dcp = 0; + DCP::ReadErrors errors; + try { + dcp = new DCP (argv[optind]); + dcp->read (keep_going, &errors); + } catch (FileError& e) { + cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n"; + exit (EXIT_FAILURE); + } catch (DCPReadError& e) { + cerr << "Could not read DCP " << argv[optind] << "; " << e.what() << "\n"; + exit (EXIT_FAILURE); + } - for (list::const_iterator i = errors.begin(); i != errors.end(); ++i) { - cerr << "Error: " << *i << "\n"; - } + cout << "DCP: " << boost::filesystem::path(argv[optind]).string() << "\n"; - list > cpls = dcp->cpls (); + dcp::filter_errors (errors, ignore_missing_assets); + for (DCP::ReadErrors::const_iterator i = errors.begin(); i != errors.end(); ++i) { + cerr << "Error: " << (*i)->what() << "\n"; + } + + cpls = dcp->cpls (); + } else { + cpls.push_back (shared_ptr(new CPL(boost::filesystem::path(argv[optind])))); + keep_going = true; + ignore_missing_assets = true; + } - for (list >::iterator i = cpls.begin(); i != cpls.end(); ++i) { - cout << " CPL: " << (*i)->annotation_text() << "\n"; - - list > reels = (*i)->reels (); + BOOST_FOREACH (shared_ptr i, cpls) { + cout << " CPL: " << i->annotation_text() << "\n"; int R = 1; - for (list >::const_iterator j = reels.begin(); j != reels.end(); ++j) { + BOOST_FOREACH (shared_ptr j, i->reels()) { cout << " Reel " << R << "\n"; try { - main_picture (*j); + main_picture (j); } catch (UnresolvedRefError& e) { if (keep_going) { - cerr << e.what() << " (for main picture)\n"; + if (!ignore_missing_assets) { + cerr << e.what() << " (for main picture)\n"; + } } else { throw; } } try { - main_sound (*j); + main_sound (j); } catch (UnresolvedRefError& e) { if (keep_going) { - cerr << e.what() << " (for main sound)\n"; + if (!ignore_missing_assets) { + cerr << e.what() << " (for main sound)\n"; + } } else { throw; } } try { - main_subtitle (*j, subtitles); + main_subtitle (j, subtitles); } catch (UnresolvedRefError& e) { if (keep_going) { - cerr << e.what() << " (for main subtitle)\n"; + if (!ignore_missing_assets) { + cerr << e.what() << " (for main subtitle)\n"; + } } else { throw; }