/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2020 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+#include "atmos_content.h"
#include "atmos_mxf_content.h"
#include "job.h"
#include "film.h"
#include "compose.hpp"
+#include <asdcp/KM_log.h>
#include <dcp/atmos_asset.h>
#include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
#include <libxml++/libxml++.h>
#include "i18n.h"
using std::list;
using std::string;
using boost::shared_ptr;
+using namespace dcpomatic;
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, boost::filesystem::path path)
- : Content (film, path)
+AtmosMXFContent::AtmosMXFContent (boost::filesystem::path path)
+ : Content (path)
{
}
-AtmosMXFContent::AtmosMXFContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, int)
- : Content (film, node)
+AtmosMXFContent::AtmosMXFContent (cxml::ConstNodePtr node, int)
+ : Content (node)
{
-
+ atmos = AtmosContent::from_xml (this, node);
}
bool
AtmosMXFContent::valid_mxf (boost::filesystem::path path)
{
+ Kumu::DefaultLogSink().UnsetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
try {
shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path));
return true;
} catch (dcp::MXFFileError& e) {
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
}
+ Kumu::DefaultLogSink().SetFilterFlag(Kumu::LOG_ALLOW_ALL);
+
return false;
}
void
-AtmosMXFContent::examine (shared_ptr<Job> job)
+AtmosMXFContent::examine (shared_ptr<const Film> film, shared_ptr<Job> job)
{
job->set_progress_unknown ();
- Content::examine (job);
+ Content::examine (film, job);
shared_ptr<dcp::AtmosAsset> a (new dcp::AtmosAsset (path(0)));
{
boost::mutex::scoped_lock lm (_mutex);
- _length = a->intrinsic_duration ();
+ atmos.reset (new AtmosContent(this));
+ atmos->set_length (a->intrinsic_duration());
+ atmos->set_edit_rate (a->edit_rate());
}
}
{
node->add_child("Type")->add_child_text ("AtmosMXF");
Content::as_xml (node, with_paths);
+ atmos->as_xml (node);
+}
+
+DCPTime
+AtmosMXFContent::full_length (shared_ptr<const Film> film) const
+{
+ FrameRateChange const frc (film, shared_from_this());
+ return DCPTime::from_frames (llrint (atmos->length() * frc.factor()), film->video_frame_rate());
}
DCPTime
-AtmosMXFContent::full_length () const
+AtmosMXFContent::approximate_length () const
{
- FrameRateChange const frc (active_video_frame_rate(), film()->video_frame_rate());
- return DCPTime::from_frames (llrint (_length * frc.factor()), film()->video_frame_rate());
+ return DCPTime::from_frames (atmos->length(), 24);
}