/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "video_mxf_decoder.h"
#include "video_decoder.h"
#include "video_mxf_content.h"
#include "j2k_image_proxy.h"
+#include "frame_interval_checker.h"
#include <dcp/mono_picture_asset.h>
#include <dcp/mono_picture_asset_reader.h>
#include <dcp/stereo_picture_asset.h>
#include <dcp/stereo_picture_asset_reader.h>
#include <dcp/exceptions.h>
-using boost::shared_ptr;
-VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
- : _content (content)
+using std::make_shared;
+using std::shared_ptr;
+using boost::optional;
+using namespace dcpomatic;
+
+
+VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
+ : Decoder (film)
+ , _content (content)
{
- video.reset (new VideoDecoder (this, content, log));
+ video = make_shared<VideoDecoder>(this, content);
- shared_ptr<dcp::MonoPictureAsset> mono;
try {
- mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
+ auto mono = make_shared<dcp::MonoPictureAsset>(_content->path(0));
+ _mono_reader = mono->start_read ();
+ _mono_reader->set_check_hmac (false);
+ _size = mono->size ();
+ return;
} catch (dcp::MXFFileError& e) {
/* maybe it's stereo */
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
/* maybe it's stereo */
}
- shared_ptr<dcp::StereoPictureAsset> stereo;
- try {
- stereo.reset (new dcp::StereoPictureAsset (_content->path(0)));
- } catch (dcp::MXFFileError& e) {
- if (!mono) {
- throw;
- }
- } catch (dcp::DCPReadError& e) {
- if (!mono) {
- throw;
- }
- }
-
- if (mono) {
- _mono_reader = mono->start_read ();
- _size = mono->size ();
- } else {
- _stereo_reader = stereo->start_read ();
- _size = stereo->size ();
- }
+ auto stereo = make_shared<dcp::StereoPictureAsset>(_content->path(0));
+ _stereo_reader = stereo->start_read ();
+ _stereo_reader->set_check_hmac (false);
+ _size = stereo->size ();
}
+
bool
VideoMXFDecoder::pass ()
{
- double const vfr = _content->active_video_frame_rate ();
- int64_t const frame = _next.frames_round (vfr);
+ auto const vfr = _content->active_video_frame_rate (film());
+ auto const frame = _next.frames_round (vfr);
if (frame >= _content->video->length()) {
return true;
if (_mono_reader) {
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), frame
+ film(),
+ std::make_shared<J2KImageProxy>(_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>()),
+ frame
);
} else {
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), frame
+ film(),
+ std::make_shared<J2KImageProxy>(_stereo_reader->get_frame(frame), _size, dcp::Eye::LEFT, AV_PIX_FMT_XYZ12LE, optional<int>()),
+ frame
);
video->emit (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), frame
+ film(),
+ std::make_shared<J2KImageProxy>(_stereo_reader->get_frame(frame), _size, dcp::Eye::RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>()),
+ frame
);
}
return false;
}
+
void
VideoMXFDecoder::seek (ContentTime t, bool accurate)
{