X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fvideo_mxf_decoder.cc;h=95dd668ee4246709ed72c08479613cd02536b9d2;hp=dc4f8d60b6882b23b255240cc4e23359bd2dcfbc;hb=de2af791bdfdcd653752cba970e59efc7bf810c7;hpb=06152300e69e8faca44ff8d7f12a6fd354848b9a diff --git a/src/lib/video_mxf_decoder.cc b/src/lib/video_mxf_decoder.cc index dc4f8d60b..95dd668ee 100644 --- a/src/lib/video_mxf_decoder.cc +++ b/src/lib/video_mxf_decoder.cc @@ -66,36 +66,34 @@ VideoMXFDecoder::VideoMXFDecoder (shared_ptr content, sha } } -bool -VideoMXFDecoder::pass (PassReason, bool) +void +VideoMXFDecoder::pass () { double const vfr = _content->active_video_frame_rate (); int64_t const frame = _next.frames_round (vfr); if (frame >= _content->video->length()) { - return true; + return; } if (_mono_reader) { - video->give ( + video->emit ( shared_ptr (new J2KImageProxy (_mono_reader->get_frame(frame), _size, AV_PIX_FMT_XYZ12LE)), frame ); } else { - video->give ( + video->emit ( shared_ptr (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE)), frame ); - video->give ( + video->emit ( shared_ptr (new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE)), frame ); } _next += ContentTime::from_frames (1, vfr); - return false; } void -VideoMXFDecoder::seek (ContentTime t, bool accurate) +VideoMXFDecoder::seek (ContentTime t, bool) { - video->seek (t, accurate); _next = t; }