/*
- Copyright (C) 2016 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2016-2017 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
#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/exceptions.h>
using boost::shared_ptr;
+using boost::optional;
+using namespace dcpomatic;
-VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const VideoMXFContent> content, shared_ptr<Log> log)
- : _content (content)
+VideoMXFDecoder::VideoMXFDecoder (shared_ptr<const Film> film, shared_ptr<const VideoMXFContent> content)
+ : Decoder (film)
+ , _content (content)
{
- video.reset (new VideoDecoder (this, content, log));
+ video.reset (new VideoDecoder (this, content));
shared_ptr<dcp::MonoPictureAsset> mono;
try {
mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
} catch (dcp::MXFFileError& e) {
/* maybe it's stereo */
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
/* maybe it's stereo */
}
if (!mono) {
throw;
}
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
if (!mono) {
throw;
}
}
bool
-VideoMXFDecoder::pass (PassReason, bool)
+VideoMXFDecoder::pass ()
{
- double const vfr = _content->active_video_frame_rate ();
+ double const vfr = _content->active_video_frame_rate (film());
int64_t const frame = _next.frames_round (vfr);
if (frame >= _content->video->length()) {
}
if (_mono_reader) {
- video->give (
- shared_ptr<ImageProxy> (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), frame
+ video->emit (
+ film(),
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
} else {
- video->give (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), frame
+ video->emit (
+ film(),
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
- video->give (
- shared_ptr<ImageProxy> (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), frame
+ video->emit (
+ film(),
+ shared_ptr<ImageProxy> (
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ ),
+ frame
);
}
- video->set_position (_next);
_next += ContentTime::from_frames (1, vfr);
return false;
}
void
VideoMXFDecoder::seek (ContentTime t, bool accurate)
{
- video->seek (t, accurate);
+ Decoder::seek (t, accurate);
_next = t;
}