#include "font.h"
#include "compose.hpp"
#include "audio_buffers.h"
+#include "image.h"
#include <dcp/mono_picture_asset.h>
#include <dcp/stereo_picture_asset.h>
#include <dcp/sound_asset.h>
#include <dcp/interop_subtitle_asset.h>
#include <dcp/smpte_subtitle_asset.h>
#include <dcp/raw_convert.h>
+#include <dcp/subtitle_image.h>
#include <boost/foreach.hpp>
#include "i18n.h"
, _period (period)
, _last_written_video_frame (-1)
, _last_written_eyes (EYES_RIGHT)
- , _total_written_audio_frames (0)
, _reel_index (reel_index)
, _reel_count (reel_count)
, _content_summary (content_summary)
it into the DCP later.
*/
+ dcp::Standard const standard = _film->interop() ? dcp::INTEROP : dcp::SMPTE;
+
if (_film->three_d ()) {
- _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
+ _picture_asset.reset (new dcp::StereoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
} else {
- _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate (), 1)));
+ _picture_asset.reset (new dcp::MonoPictureAsset (dcp::Fraction (_film->video_frame_rate(), 1), standard));
}
_picture_asset->set_size (_film->frame_size ());
_picture_asset_writer = _picture_asset->start_write (
_film->internal_video_asset_dir() / _film->internal_video_asset_filename(_period),
- _film->interop() ? dcp::INTEROP : dcp::SMPTE,
_first_nonexistant_frame > 0
);
if (_film->audio_channels ()) {
_sound_asset.reset (
- new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ())
+ new dcp::SoundAsset (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels (), standard)
);
if (_film->encrypted ()) {
of the DCP directory until the last minute.
*/
_sound_asset_writer = _sound_asset->start_write (
- _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary),
- _film->interop() ? dcp::INTEROP : dcp::SMPTE
+ _film->directory().get() / audio_asset_filename (_sound_asset, _reel_index, _reel_count, _content_summary)
);
}
}
bool const read = boost::filesystem::exists (info_file);
-#ifdef DCPOMATIC_WINDOWS
- if (read) {
- LOG_GENERAL (
- "Checked %1 (which exists) length is %2 perms are %3",
- info_file, boost::filesystem::file_size (info_file), int(boost::filesystem::status(info_file).permissions())
- );
- } else {
- LOG_GENERAL ("Checked %1 (which does not exist)", info_file);
- }
-#endif
-
if (read) {
file = fopen_boost (info_file, "r+b");
} else {
Frame
ReelWriter::check_existing_picture_asset ()
{
- /* Try to open the existing asset */
DCPOMATIC_ASSERT (_picture_asset->file());
- FILE* asset_file = fopen_boost (_picture_asset->file().get(), "rb");
+ boost::filesystem::path asset = _picture_asset->file().get();
+
+ /* If there is an existing asset, break any hard links to it as we are about to change its contents
+ (if only by changing the IDs); see #1126.
+ */
+
+ if (boost::filesystem::exists(asset) && boost::filesystem::hard_link_count(asset) > 1) {
+ boost::filesystem::copy_file (asset, asset.string() + ".tmp");
+ boost::filesystem::remove (asset);
+ boost::filesystem::rename (asset.string() + ".tmp", asset);
+ }
+
+ /* Try to open the existing asset */
+ FILE* asset_file = fopen_boost (asset, "rb");
if (!asset_file) {
- LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", _picture_asset->file()->string(), errno);
+ LOG_GENERAL ("Could not open existing asset at %1 (errno=%2)", asset.string(), errno);
return 0;
} else {
- LOG_GENERAL ("Opened existing asset at %1", _picture_asset->file()->string());
+ LOG_GENERAL ("Opened existing asset at %1", asset.string());
}
/* Offset of the last dcp::FrameInfo in the info file */
} else {
/* All our assets should be the same length; use the picture asset length here
- as a reference to set the subtitle one.
+ as a reference to set the subtitle one. We'll use the duration rather than
+ the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+ just interested in its presentation length.
*/
dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
- reel_picture_asset->intrinsic_duration ()
+ reel_picture_asset->duration ()
);
_subtitle_asset->write (
new dcp::ReelSubtitleAsset (
_subtitle_asset,
dcp::Fraction (_film->video_frame_rate(), 1),
- reel_picture_asset->intrinsic_duration (),
+ reel_picture_asset->duration(),
0
)
);
}
if (reel_subtitle_asset) {
- DCPOMATIC_ASSERT (reel_subtitle_asset->duration() == period_duration);
+ if (reel_subtitle_asset->duration() != period_duration) {
+ throw ProgrammingError (
+ __FILE__, __LINE__,
+ String::compose ("%1 vs %2", reel_subtitle_asset->duration(), period_duration)
+ );
+ }
reel->add (reel_subtitle_asset);
}
return;
}
- if (audio) {
- _sound_asset_writer->write (audio->data(), audio->frames());
- }
-
- _total_written_audio_frames += audio->frames ();
+ DCPOMATIC_ASSERT (audio);
+ _sound_asset_writer->write (audio->data(), audio->frames());
}
void
-ReelWriter::write (PlayerSubtitles subs)
+ReelWriter::write (PlayerSubtitles subs, DCPTimePeriod period)
{
if (!_subtitle_asset) {
string lang = _film->subtitle_language ();
}
BOOST_FOREACH (SubtitleString i, subs.text) {
+ /* XXX: couldn't / shouldn't we use period here rather than getting time from the subtitle? */
i.set_in (i.in() - dcp::Time (_period.from.seconds(), i.in().tcr));
i.set_out (i.out() - dcp::Time (_period.from.seconds(), i.out().tcr));
- _subtitle_asset->add (i);
+ _subtitle_asset->add (shared_ptr<dcp::Subtitle>(new dcp::SubtitleString(i)));
+ }
+
+ BOOST_FOREACH (BitmapText i, subs.image) {
+ _subtitle_asset->add (
+ shared_ptr<dcp::Subtitle>(
+ new dcp::SubtitleImage(
+ i.image->as_png(),
+ dcp::Time(period.from.seconds(), _film->video_frame_rate()),
+ dcp::Time(period.to.seconds(), _film->video_frame_rate()),
+ i.rectangle.x, dcp::HALIGN_LEFT, i.rectangle.y, dcp::VALIGN_TOP,
+ dcp::Time(), dcp::Time()
+ )
+ )
+ );
}
}