#include <libavformat/avformat.h>
#include <libavutil/pixdesc.h>
}
+#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
+#include <iostream>
#include "i18n.h"
-#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
using std::string;
using std::vector;
using std::make_pair;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
+using boost::optional;
int const FFmpegContentProperty::SUBTITLE_STREAMS = 100;
int const FFmpegContentProperty::SUBTITLE_STREAM = 101;
}
}
- _first_video = node->optional_number_child<double> ("FirstVideo");
+ optional<ContentTime::Type> const f = node->optional_number_child<ContentTime::Type> ("FirstVideo");
+ if (f) {
+ _first_video = ContentTime (f.get ());
+ }
_color_range = static_cast<AVColorRange> (node->optional_number_child<int>("ColorRange").get_value_or (AVCOL_RANGE_UNSPECIFIED));
_color_primaries = static_cast<AVColorPrimaries> (node->optional_number_child<int>("ColorPrimaries").get_value_or (AVCOL_PRI_UNSPECIFIED));
node->optional_number_child<int>("ColorTransferCharacteristic").get_value_or (AVCOL_TRC_UNSPECIFIED)
);
_colorspace = static_cast<AVColorSpace> (node->optional_number_child<int>("Colorspace").get_value_or (AVCOL_SPC_UNSPECIFIED));
- _bits_per_pixel = static_cast<int> (node->number_child<int> ("BitsPerPixel"));
+ _bits_per_pixel = node->optional_number_child<int> ("BitsPerPixel");
}
node->add_child("ColorPrimaries")->add_child_text (raw_convert<string> (_color_primaries));
node->add_child("ColorTransferCharacteristic")->add_child_text (raw_convert<string> (_color_trc));
node->add_child("Colorspace")->add_child_text (raw_convert<string> (_colorspace));
- node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (_bits_per_pixel));
+ if (_bits_per_pixel) {
+ node->add_child("BitsPerPixel")->add_child_text (raw_convert<string> (_bits_per_pixel.get ()));
+ }
}
void
shared_ptr<const Film> film = _film.lock ();
DCPOMATIC_ASSERT (film);
FrameRateChange const frc (video_frame_rate (), film->video_frame_rate ());
- return DCPTime::from_frames (rint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate());
+ return DCPTime::from_frames (llrint (video_length_after_3d_combine() * frc.factor()), film->video_frame_rate());
}
void
{
VideoContent::add_properties (p);
- int const sub = 219 * pow (2, _bits_per_pixel - 8);
- int const total = pow (2, _bits_per_pixel);
-
- switch (_color_range) {
- case AVCOL_RANGE_UNSPECIFIED:
- p.push_back (make_pair (_("Colour range"), _("Unspecified")));
- break;
- case AVCOL_RANGE_MPEG:
- p.push_back (make_pair (_("Colour range"), String::compose ("Limited (%1-%2)", (total - sub) / 2, (total + sub) / 2)));
- break;
- case AVCOL_RANGE_JPEG:
- p.push_back (make_pair (_("Colour range"), String::compose ("Full (0-total)", (total - sub) / 2, (total + sub) / 2)));
- break;
- default:
- DCPOMATIC_ASSERT (false);
+ if (_bits_per_pixel) {
+ int const sub = 219 * pow (2, _bits_per_pixel.get() - 8);
+ int const total = pow (2, _bits_per_pixel.get());
+
+ switch (_color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ p.push_back (make_pair (_("Colour range"), _("Unspecified")));
+ break;
+ case AVCOL_RANGE_MPEG:
+ p.push_back (make_pair (_("Colour range"), String::compose (_("Limited (%1-%2)"), (total - sub) / 2, (total + sub) / 2)));
+ break;
+ case AVCOL_RANGE_JPEG:
+ p.push_back (make_pair (_("Colour range"), String::compose (_("Full (0-%1)"), total)));
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
+ } else {
+ switch (_color_range) {
+ case AVCOL_RANGE_UNSPECIFIED:
+ p.push_back (make_pair (_("Colour range"), _("Unspecified")));
+ break;
+ case AVCOL_RANGE_MPEG:
+ p.push_back (make_pair (_("Colour range"), _("Limited")));
+ break;
+ case AVCOL_RANGE_JPEG:
+ p.push_back (make_pair (_("Colour range"), _("Full")));
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ }
}
char const * primaries[] = {
DCPOMATIC_ASSERT (AVCOL_SPC_NB == 11);
p.push_back (make_pair (_("Colourspace"), spaces[_colorspace]));
- p.push_back (make_pair (_("Bits per pixel"), raw_convert<string> (_bits_per_pixel)));
+ if (_bits_per_pixel) {
+ p.push_back (make_pair (_("Bits per pixel"), raw_convert<string> (_bits_per_pixel.get ())));
+ }
}