X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=fd5779a657f0304124a28ef27980a62a85a1945a;hb=88bb39c23e73041cdd7178414473a2223be277fa;hp=e87fa2eb1dec8d3b07b60273da075662867322e5;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index e87fa2eb1..fd5779a65 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -44,7 +44,7 @@ VideoDecoder::VideoDecoder (shared_ptr<const VideoContent> c)
 	, _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 ();
 }
 
@@ -75,7 +75,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
 	   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);
@@ -98,7 +98,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
 				break;
 			}
 
-			if (pass ()) {
+			if (pass (PASS_REASON_VIDEO, accurate)) {
 				/* The decoder has nothing more for us */
 				break;
 			}
@@ -115,7 +115,7 @@ VideoDecoder::get_video (Frame frame, bool accurate)
 		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 ());
 		}
@@ -240,7 +240,7 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
 		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.
@@ -318,10 +318,14 @@ VideoDecoder::video (shared_ptr<const ImageProxy> image, Frame frame)
 
 	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