X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fffmpeg.C;h=97b6698acbb2ffc342f93049dbd54537d0a39235;hb=000e295b1fdc93084a11b304cf0b65c158dab4ea;hp=f0eea9c5be34a5627494378052861e515c7548ad;hpb=588649236b6ae38da7c8627ff7439aeff3c78798;p=goodguy%2Fcinelerra.git

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index f0eea9c5..97b6698a 100644
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1222,19 +1222,31 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos)
 		return -1;
 	}
 	int i = MAX_RETRY + pos - curr_pos;
+	int64_t cache_start = 0;
 	while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) {
 		ret = read_frame(frame);
 		if( ret > 0 ) {
 			if( frame->key_frame && seeking < 0 ) {
-				seeking = 1;
-				ffmpeg->purge_cache();
-			}
-			if( ffmpeg->get_use_cache() && seeking > 0 && curr_pos < pos ) {
-				VFrame *cache_frame = ffmpeg->new_cache_frame(vframe, curr_pos);
-				if( cache_frame ) {
-					ret = convert_cmodel(cache_frame, frame);
-					ffmpeg->put_cache_frame();
+				int use_cache = ffmpeg->get_use_cache();
+				if( use_cache < 0 ) {
+// for reverse read, reload file frame_cache from keyframe to pos
+					ffmpeg->purge_cache();
+					int count = preferences->cache_size /
+						vframe->get_data_size() / 2;  // try to burn only 1/2 of cache
+					cache_start = pos - count + 1;
+					seeking = 1;
 				}
+				else
+					seeking = 0;
+			}
+			if( seeking > 0 && curr_pos >= cache_start && curr_pos < pos ) {
+				int vw =vframe->get_w(), vh = vframe->get_h();
+				int vcolor_model = vframe->get_color_model();
+// do not use shm here, puts too much pressure on 32bit systems
+				VFrame *cache_frame = new VFrame(vw, vh, vcolor_model, 0);
+				ret = convert_cmodel(cache_frame, frame);
+				if( ret > 0 )
+					ffmpeg->put_cache_frame(cache_frame, curr_pos);
 			}
 			++curr_pos;
 		}
@@ -2233,14 +2245,9 @@ int FFMPEG::scan_options(const char *options, AVDictionary *&opts, AVStream *st)
 	return ret;
 }
 
-VFrame *FFMPEG::new_cache_frame(VFrame *vframe, int64_t position)
-{
-	return file_base->file->new_cache_frame(vframe, position, 0);
-}
-
-void FFMPEG::put_cache_frame()
+void FFMPEG::put_cache_frame(VFrame *frame, int64_t position)
 {
-	return file_base->file->put_cache_frame();
+	file_base->file->put_cache_frame(frame, position, 0);
 }
 
 int FFMPEG::get_use_cache()