, _last_seek_accurate (true)
, _ignore_video (false)
{
- _black_image.reset (new Image (PIX_FMT_RGB24, _video_content->video_size(), true));
+ _black_image.reset (new Image (AV_PIX_FMT_RGB24, _video_content->video_size(), true));
_black_image->make_black ();
}
one after the end of _decoded_video we need to seek.
*/
- _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), Log::TYPE_DEBUG_DECODE);
+ _video_content->film()->log()->log (String::compose ("VD has request for %1", frame), LogEntry::TYPE_DEBUG_DECODE);
if (_decoded_video.empty() || frame < _decoded_video.front().frame || frame > (_decoded_video.back().frame + 1)) {
seek (ContentTime::from_frames (frame, _video_content->video_frame_rate()), accurate);
break;
}
- if (pass ()) {
+ if (pass (PASS_REASON_VIDEO, accurate)) {
/* The decoder has nothing more for us */
break;
}
dec = decoded_video (frame);
} else {
/* Any frame will do: use the first one that comes out of pass() */
- while (_decoded_video.empty() && !pass ()) {}
+ while (_decoded_video.empty() && !pass (PASS_REASON_VIDEO, accurate)) {}
if (!_decoded_video.empty ()) {
dec.push_back (_decoded_video.front ());
}
return;
}
- _video_content->film()->log()->log (String::compose ("VD receives %1", frame), Log::TYPE_DEBUG_DECODE);
+ _video_content->film()->log()->log (String::compose ("VD receives %1", frame), LogEntry::TYPE_DEBUG_DECODE);
/* We may receive the same frame index twice for 3D, and we need to know
when that happens.
copy (to_push.begin(), to_push.end(), back_inserter (_decoded_video));
- /* We can't let this build up too much or we will run out of memory. We need to allow
- the most frames that can exist between blocks of sound in a multiplexed file.
+ /* We can't let this build up too much or we will run out of memory. There is a
+ `best' value for the allowed size of _decoded_video which balances memory use
+ with decoding efficiency (lack of seeks). Throwing away video frames here
+ is not a problem for correctness, so do it.
*/
- DCPOMATIC_ASSERT (_decoded_video.size() <= 96);
+ while (_decoded_video.size() > 96) {
+ _decoded_video.pop_back ();
+ }
}
void