projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle multiple audio streams in a single piece of content
[dcpomatic.git]
/
src
/
lib
/
dcp_decoder.cc
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index d0642d8b6ca9f6fe06edd76a6f1b3611aa7a5496..0411ad94183d8818df84adcc5d23ac5ec1d3b5f8 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-17,6
+17,11
@@
*/
*/
+#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/dcp.h>
#include <dcp/cpl.h>
#include <dcp/reel.h>
@@
-27,34
+32,32
@@
#include <dcp/mono_picture_frame.h>
#include <dcp/stereo_picture_frame.h>
#include <dcp/sound_frame.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"
using std::list;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
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)
: VideoDecoder (c)
, AudioDecoder (c)
, SubtitleDecoder (c)
- , _log (log)
, _dcp_content (c)
{
dcp::DCP dcp (c->directory ());
dcp.read ();
, _dcp_content (c)
{
dcp::DCP dcp (c->directory ());
dcp.read ();
- assert (dcp.cpls().size() == 1);
+ if (c->kdm ()) {
+ dcp.add (dcp::DecryptedKDM (c->kdm().get (), Config::instance()->decryption_private_key ()));
+ }
+ DCPOMATIC_ASSERT (dcp.cpls().size() == 1);
_reels = dcp.cpls().front()->reels ();
_reel = _reels.begin ();
}
bool
_reels = dcp.cpls().front()->reels ();
_reel = _reels.begin ();
}
bool
-DCPDecoder::pass ()
+DCPDecoder::pass (
PassReason
)
{
{
- if (_reel == _reels.end ()) {
+ if (_reel == _reels.end ()
|| !_dcp_content->can_be_played ()
) {
return true;
}
return true;
}
@@
-67,15
+70,15
@@
DCPDecoder::pass ()
shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
int64_t const entry_point = (*_reel)->main_picture()->entry_point ();
if (mono) {
shared_ptr<dcp::StereoPictureMXF> stereo = dynamic_pointer_cast<dcp::StereoPictureMXF> (mxf);
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), mxf->size())), frame);
} else {
video (
} 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), mxf->size(), dcp::EYE_LEFT)),
frame
);
video (
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), mxf->size(), dcp::EYE_RIGHT)),
frame
);
}
frame
);
}
@@
-86,7
+89,7
@@
DCPDecoder::pass ()
shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->get_frame (entry_point + frame);
uint8_t const * from = sf->data ();
shared_ptr<const dcp::SoundFrame> sf = (*_reel)->main_sound()->mxf()->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) {
int const frames = sf->size() / (3 * channels);
shared_ptr<AudioBuffers> data (new AudioBuffers (channels, frames));
for (int i = 0; i < frames; ++i) {
@@
-96,7
+99,7
@@
DCPDecoder::pass ()
}
}
}
}
- audio (data, _next);
+ audio (
_dcp_content->audio_stream(),
data, _next);
}
/* XXX: subtitle */
}
/* XXX: subtitle */
@@
-130,7
+133,14
@@
DCPDecoder::seek (ContentTime t, bool accurate)
list<ContentTimePeriod>
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, bool) const
{
{
+ /* XXX */
return list<ContentTimePeriod> ();
}
return list<ContentTimePeriod> ();
}