/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 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
*/
+#include "dcp_decoder.h"
+#include "dcp_content.h"
+#include "j2k_image_proxy.h"
+#include "image.h"
+#include "config.h"
#include <dcp/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
-#include <dcp/mono_picture_mxf.h>
-#include <dcp/stereo_picture_mxf.h>
+#include <dcp/mono_picture_asset.h>
+#include <dcp/stereo_picture_asset.h>
#include <dcp/reel_picture_asset.h>
#include <dcp/reel_sound_asset.h>
+#include <dcp/reel_subtitle_asset.h>
#include <dcp/mono_picture_frame.h>
#include <dcp/stereo_picture_frame.h>
#include <dcp/sound_frame.h>
-#include "dcp_decoder.h"
-#include "dcp_content.h"
-#include "j2k_image_proxy.h"
-#include "image.h"
-#include "config.h"
+#include <boost/foreach.hpp>
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c, shared_ptr<Log> log)
+DCPDecoder::DCPDecoder (shared_ptr<const DCPContent> c)
: VideoDecoder (c)
, AudioDecoder (c)
, SubtitleDecoder (c)
- , _log (log)
, _dcp_content (c)
{
dcp::DCP dcp (c->directory ());
dcp.read ();
if (c->kdm ()) {
- dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_private_key ()));
+ dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_chain()->key().get ()));
}
- assert (dcp.cpls().size() == 1);
+ DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
_reels = dcp.cpls().front()->reels ();
_reel = _reels.begin ();
}
return true;
}
- float const vfr = _dcp_content->video_frame_rate ();
- int64_t const frame = _next.frames (vfr);
-
+ double const vfr = _dcp_content->video_frame_rate ();
+ int64_t const frame = _next.frames_round (vfr);
+
if ((*_reel)->main_picture ()) {
- shared_ptr<dcp::PictureMXF> mxf = (*_reel)->main_picture()->mxf ();
- shared_ptr<dcp::MonoPictureMXF> mono = dynamic_pointer_cast<dcp::MonoPictureMXF> (mxf);
- shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
+ shared_ptr<dcp::PictureAsset> asset = (*_reel)->main_picture()->asset ();
+ shared_ptr<dcp::MonoPictureAsset> mono = dynamic_pointer_cast<dcp::MonoPictureAsset> (asset);
+ shared_ptr<dcp::StereoPictureAsset> stereo = dynamic_pointer_cast<dcp::StereoPictureAsset> (asset);
int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
if (mono) {
- video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame);
+ video (shared_ptr<ImageProxy> (new J2KImageProxy (mono->get_frame (entry_point + frame), asset->size())), frame);
} else {
video (
- shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)),
+ shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_LEFT)),
frame
);
-
+
video (
- shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)),
+ shared_ptr<ImageProxy> (new J2KImageProxy (stereo->get_frame (entry_point + frame), asset->size(), dcp::EYE_RIGHT)),
frame
);
}
if ((*_reel)->main_sound ()) {
int64_t const entry_point = (*_reel)->main_sound()->entry_point ();
- shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->get_frame (entry_point + frame);
+ shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->asset()->get_frame (entry_point + frame);
uint8_t const * from = sf->data ();
- int const channels = _dcp_content->audio_channels ();
+ int const channels = _dcp_content->audio_stream()->channels ();
int const frames = sf->size() / (3 * channels);
shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
for (int i = 0; i < frames; ++i) {
for (int j = 0; j < channels; ++j) {
- data->data()[j][i] = float (from[0] | (from[1] << 8) | (from[2] << 16)) / (1 << 23);
+ data->data()[j][i] = static_cast<int> ((from[0] << 8) | (from[1] << 16) | (from[2] << 24)) / static_cast<float> (INT_MAX - 256);
from += 3;
}
}
- audio (data, _next);
+ audio (_dcp_content->audio_stream(), data, _next);
}
- /* XXX: subtitle */
+ if ((*_reel)->main_subtitle ()) {
+ int64_t const entry_point = (*_reel)->main_subtitle()->entry_point ();
+ list<dcp::SubtitleString> subs = (*_reel)->main_subtitle()->subtitle_asset()->subtitles_during (
+ dcp::Time (entry_point + frame, vfr, vfr),
+ dcp::Time (entry_point + frame + 1, vfr, vfr),
+ true
+ );
+
+ if (!subs.empty ()) {
+ /* XXX: assuming that all `subs' are at the same time; maybe this is ok */
+ text_subtitle (
+ ContentTimePeriod (
+ ContentTime::from_seconds (subs.front().in().as_seconds ()),
+ ContentTime::from_seconds (subs.front().out().as_seconds ())
+ ),
+ subs
+ );
+ }
+ }
_next += ContentTime::from_frames (1, vfr);
if ((*_reel)->main_picture ()) {
- if (_next.frames (vfr) >= (*_reel)->main_picture()->duration()) {
+ if (_next.frames_round (vfr) >= (*_reel)->main_picture()->duration()) {
++_reel;
}
}
-
+
return false;
}
list<ContentTimePeriod>
-DCPDecoder::subtitles_during (ContentTimePeriod, bool starting) const
+DCPDecoder::image_subtitles_during (ContentTimePeriod, bool) const
{
return list<ContentTimePeriod> ();
}
+
+list<ContentTimePeriod>
+DCPDecoder::text_subtitles_during (ContentTimePeriod period, bool starting) const
+{
+ /* XXX: inefficient */
+
+ list<ContentTimePeriod> ctp;
+ double const vfr = _dcp_content->video_frame_rate ();
+
+ BOOST_FOREACH (shared_ptr<dcp::Reel> r, _reels) {
+ if (!r->main_subtitle ()) {
+ continue;
+ }
+
+ int64_t const entry_point = r->main_subtitle()->entry_point ();
+
+ list<dcp::SubtitleString> subs = r->main_subtitle()->subtitle_asset()->subtitles_during (
+ dcp::Time (period.from.seconds ()) - dcp::Time (entry_point, vfr, vfr),
+ dcp::Time (period.to.seconds ()) - dcp::Time (entry_point, vfr, vfr),
+ starting
+ );
+
+ BOOST_FOREACH (dcp::SubtitleString const & s, subs) {
+ ctp.push_back (
+ ContentTimePeriod (
+ ContentTime::from_seconds (s.in().as_seconds ()),
+ ContentTime::from_seconds (s.out().as_seconds ())
+ )
+ );
+ }
+ }
+
+ return ctp;
+}