Merge master.
authorCarl Hetherington <cth@carlh.net>
Sat, 4 May 2013 10:15:35 +0000 (11:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 4 May 2013 10:15:35 +0000 (11:15 +0100)
1  2 
src/cpl.cc
src/mxf_asset.cc
src/mxf_asset.h
src/picture_asset.cc

diff --cc src/cpl.cc
index 18526b245d08c9fac0bdf3d48d923ab83b454767,0000000000000000000000000000000000000000..10a83078ed1c1ca40c4a273ed30134e3a57b794a
mode 100644,000000..100644
--- /dev/null
@@@ -1,296 -1,0 +1,301 @@@
-                               picture->set_entry_point ((*i)->asset_list->main_picture->entry_point);
 +/*
 +    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 <fstream>
 +#include "cpl.h"
 +#include "cpl_file.h"
 +#include "util.h"
 +#include "picture_asset.h"
 +#include "sound_asset.h"
 +#include "subtitle_asset.h"
 +#include "asset_map.h"
 +#include "reel.h"
 +#include "metadata.h"
 +
 +using std::string;
 +using std::stringstream;
 +using std::ofstream;
 +using std::ostream;
 +using std::list;
 +using boost::shared_ptr;
 +using namespace libdcp;
 +
 +CPL::CPL (string directory, string name, ContentKind content_kind, int length, int frames_per_second)
 +      : _directory (directory)
 +      , _name (name)
 +      , _content_kind (content_kind)
 +      , _length (length)
 +      , _fps (frames_per_second)
 +{
 +      _uuid = make_uuid ();
 +}
 +
 +/** Construct a CPL object from a XML file.
 + *  @param directory The directory containing this CPL's DCP.
 + *  @param file The CPL XML filename.
 + *  @param asset_map The corresponding asset map.
 + *  @param require_mxfs true to throw an exception if a required MXF file does not exist.
 + */
 +CPL::CPL (string directory, string file, shared_ptr<const AssetMap> asset_map, bool require_mxfs)
 +      : _directory (directory)
 +      , _content_kind (FEATURE)
 +      , _length (0)
 +      , _fps (0)
 +{
 +      /* Read the XML */
 +      shared_ptr<CPLFile> cpl;
 +      try {
 +              cpl.reset (new CPLFile (file));
 +      } catch (FileError& e) {
 +              boost::throw_exception (FileError ("could not load CPL file", file));
 +      }
 +      
 +      /* Now cherry-pick the required bits into our own data structure */
 +      
 +      _name = cpl->annotation_text;
 +      _content_kind = cpl->content_kind;
 +
 +      for (list<shared_ptr<CPLReel> >::iterator i = cpl->reels.begin(); i != cpl->reels.end(); ++i) {
 +
 +              shared_ptr<Picture> p;
 +
 +              if ((*i)->asset_list->main_picture) {
 +                      p = (*i)->asset_list->main_picture;
 +              } else {
 +                      p = (*i)->asset_list->main_stereoscopic_picture;
 +              }
 +              
 +              _fps = p->edit_rate.numerator;
 +              _length += p->duration;
 +
 +              shared_ptr<PictureAsset> picture;
 +              shared_ptr<SoundAsset> sound;
 +              shared_ptr<SubtitleAsset> subtitle;
 +
 +              /* Some rather twisted logic to decide if we are 3D or not;
 +                 some DCPs give a MainStereoscopicPicture to indicate 3D, others
 +                 just have a FrameRate twice the EditRate and apparently
 +                 expect you to divine the fact that they are hence 3D.
 +              */
 +
 +              if (!(*i)->asset_list->main_stereoscopic_picture && p->edit_rate == p->frame_rate) {
 +
 +                      try {
 +                              picture.reset (new MonoPictureAsset (
 +                                                     _directory,
 +                                                     asset_map->asset_from_id (p->id)->chunks.front()->path
 +                                                     )
 +                                      );
 +
++                              picture->set_entry_point (p->entry_point);
++                              picture->set_duration (p->duration);
 +                      } catch (MXFFileError) {
 +                              if (require_mxfs) {
 +                                      throw;
 +                              }
 +                      }
 +                      
 +              } else {
 +                      try {
 +                              picture.reset (new StereoPictureAsset (
 +                                                     _directory,
 +                                                     asset_map->asset_from_id (p->id)->chunks.front()->path,
 +                                                     _fps,
 +                                                     p->duration
 +                                                     )
 +                                      );
 +
 +                              picture->set_entry_point (p->entry_point);
++                              picture->set_duration (p->duration);
 +                              
 +                      } catch (MXFFileError) {
 +                              if (require_mxfs) {
 +                                      throw;
 +                              }
 +                      }
 +                      
 +              }
 +              
 +              if ((*i)->asset_list->main_sound) {
 +                      
 +                      try {
 +                              sound.reset (new SoundAsset (
 +                                                   _directory,
 +                                                   asset_map->asset_from_id ((*i)->asset_list->main_sound->id)->chunks.front()->path
 +                                                   )
 +                                      );
 +
 +                              sound->set_entry_point ((*i)->asset_list->main_sound->entry_point);
++                              sound->set_duration ((*i)->asset_list->main_sound->duration);
 +                      } catch (MXFFileError) {
 +                              if (require_mxfs) {
 +                                      throw;
 +                              }
 +                      }
 +              }
 +
 +              if ((*i)->asset_list->main_subtitle) {
 +                      
 +                      subtitle.reset (new SubtitleAsset (
 +                                              _directory,
 +                                              asset_map->asset_from_id ((*i)->asset_list->main_subtitle->id)->chunks.front()->path
 +                                              )
 +                              );
++
++                      subtitle->set_entry_point ((*i)->asset_list->main_subtitle->entry_point);
++                      subtitle->set_duration ((*i)->asset_list->main_subtitle->duration);
 +              }
 +                      
 +              _reels.push_back (shared_ptr<Reel> (new Reel (picture, sound, subtitle)));
 +      }
 +}
 +
 +void
 +CPL::add_reel (shared_ptr<const Reel> reel)
 +{
 +      _reels.push_back (reel);
 +}
 +
 +void
 +CPL::write_xml (XMLMetadata const & metadata) const
 +{
 +      boost::filesystem::path p;
 +      p /= _directory;
 +      stringstream s;
 +      s << _uuid << "_cpl.xml";
 +      p /= s.str();
 +      ofstream os (p.string().c_str());
 +      
 +      os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 +         << "<CompositionPlaylist xmlns=\"http://www.smpte-ra.org/schemas/429-7/2006/CPL\">\n"
 +         << "  <Id>urn:uuid:" << _uuid << "</Id>\n"
 +         << "  <AnnotationText>" << _name << "</AnnotationText>\n"
 +         << "  <IssueDate>" << metadata.issue_date << "</IssueDate>\n"
 +         << "  <Creator>" << metadata.creator << "</Creator>\n"
 +         << "  <ContentTitleText>" << _name << "</ContentTitleText>\n"
 +         << "  <ContentKind>" << content_kind_to_string (_content_kind) << "</ContentKind>\n"
 +         << "  <ContentVersion>\n"
 +         << "    <Id>urn:uri:" << _uuid << "_" << metadata.issue_date << "</Id>\n"
 +         << "    <LabelText>" << _uuid << "_" << metadata.issue_date << "</LabelText>\n"
 +         << "  </ContentVersion>\n"
 +         << "  <RatingList/>\n"
 +         << "  <ReelList>\n";
 +      
 +      for (list<shared_ptr<const Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
 +              (*i)->write_to_cpl (os);
 +      }
 +
 +      os << "  </ReelList>\n"
 +         << "</CompositionPlaylist>\n";
 +
 +      os.close ();
 +
 +      _digest = make_digest (p.string ());
 +      _length = boost::filesystem::file_size (p.string ());
 +}
 +
 +void
 +CPL::write_to_pkl (ostream& s) const
 +{
 +      s << "    <Asset>\n"
 +        << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
 +        << "      <Hash>" << _digest << "</Hash>\n"
 +        << "      <Size>" << _length << "</Size>\n"
 +        << "      <Type>text/xml</Type>\n"
 +        << "    </Asset>\n";
 +}
 +
 +list<shared_ptr<const Asset> >
 +CPL::assets () const
 +{
 +      list<shared_ptr<const Asset> > a;
 +      for (list<shared_ptr<const Reel> >::const_iterator i = _reels.begin(); i != _reels.end(); ++i) {
 +              if ((*i)->main_picture ()) {
 +                      a.push_back ((*i)->main_picture ());
 +              }
 +              if ((*i)->main_sound ()) {
 +                      a.push_back ((*i)->main_sound ());
 +              }
 +              if ((*i)->main_subtitle ()) {
 +                      a.push_back ((*i)->main_subtitle ());
 +              }
 +      }
 +
 +      return a;
 +}
 +
 +void
 +CPL::write_to_assetmap (ostream& s) const
 +{
 +      s << "    <Asset>\n"
 +        << "      <Id>urn:uuid:" << _uuid << "</Id>\n"
 +        << "      <ChunkList>\n"
 +        << "        <Chunk>\n"
 +        << "          <Path>" << _uuid << "_cpl.xml</Path>\n"
 +        << "          <VolumeIndex>1</VolumeIndex>\n"
 +        << "          <Offset>0</Offset>\n"
 +        << "          <Length>" << _length << "</Length>\n"
 +        << "        </Chunk>\n"
 +        << "      </ChunkList>\n"
 +        << "    </Asset>\n";
 +}
 +      
 +      
 +      
 +bool
 +CPL::equals (CPL const & other, EqualityOptions opt, boost::function<void (NoteType, string)> note) const
 +{
 +      if (_name != other._name) {
 +              note (ERROR, "names differ");
 +              return false;
 +      }
 +
 +      if (_content_kind != other._content_kind) {
 +              note (ERROR, "content kinds differ");
 +              return false;
 +      }
 +
 +      if (_fps != other._fps) {
 +              note (ERROR, "frames per second differ");
 +              return false;
 +      }
 +
 +      if (_length != other._length) {
 +              note (ERROR, "lengths differ");
 +              return false;
 +      }
 +
 +      if (_reels.size() != other._reels.size()) {
 +              note (ERROR, "reel counts differ");
 +              return false;
 +      }
 +      
 +      list<shared_ptr<const Reel> >::const_iterator a = _reels.begin ();
 +      list<shared_ptr<const Reel> >::const_iterator b = other._reels.begin ();
 +      
 +      while (a != _reels.end ()) {
 +              if (!(*a)->equals (*b, opt, note)) {
 +                      return false;
 +              }
 +              ++a;
 +              ++b;
 +      }
 +
 +      return true;
 +}
Simple merge
diff --cc src/mxf_asset.h
index f5cee5de3fed2cb3cf2d8b211e0fd772b9694e6a,5815fd9055c1f26fc85d520e8e7bc7fb9ebcb330..55aa889a10d091c22e5212735a57ae2de6557172
@@@ -77,20 -55,12 +57,12 @@@ public
         *  @param w struct to fill in.
         *  @param uuid uuid to use.
         */
 -      static void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid);
 +      static void fill_writer_info (ASDCP::WriterInfo* w, std::string uuid, MXFMetadata const & metadata);
  
  protected:
 -
 +      
        /** Signal to emit to report progress, or 0 */
        boost::signals2::signal<void (float)>* _progress;
-       /** The edit rate; this is normally equal to the number of video frames per second */
-       int _edit_rate;
-       /** Start point to present in frames */
-       int _entry_point;
-       /** Total length in frames */
-       int _intrinsic_duration;
-       /** Length to present in frames */
-       int _duration;
  };
  
  }
Simple merge