rework rev vid caching, rework vid read_frame, rework framecache, tweak cached transi...

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / ffmpeg.C

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.C b/cinelerra-5.1/cinelerra/ffmpeg.C
index 57232271b1473e750337eda8886b838df12e6f65..7dca62a696defe3282d7494aaa1c29e15dfc41d0 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.C
+++ b/cinelerra-5.1/cinelerra/ffmpeg.C
@@ -1225,14 +1225,23 @@ int FFVideoStream::load(VFrame *vframe, int64_t pos)
        while( ret>=0 && !flushed && curr_pos<=pos && --i>=0 ) {
                ret = read_frame(frame);
                if( ret > 0 ) {
-                       if( frame->key_frame && seeking < 0 )
-                               seeking = 1;
-                       if( ffmpeg->file_base->get_use_cache() && seeking > 0 && curr_pos < pos ) {
-                               VFrame *cache_frame = ffmpeg->file_base->new_cache_frame(vframe, curr_pos);
-                               if( cache_frame ) {
-                                       ret = convert_cmodel(cache_frame, frame);
-                                       ffmpeg->file_base->put_cache_frame();
+                       if( frame->key_frame && seeking < 0 ) {
+                               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();
+                                       seeking = 1;
                                }
+                               else
+                                       seeking = 0;
+                       }
+                       if( seeking > 0 && curr_pos < pos ) {
+                               int vw =vframe->get_w(), vh = vframe->get_h();
+                               int vcolor_model = vframe->get_color_model();
+                               VFrame *cache_frame = new VFrame(vw, vh, vcolor_model);
+                               ret = convert_cmodel(cache_frame, frame);
+                               if( ret > 0 )
+                                       ffmpeg->put_cache_frame(cache_frame, curr_pos);
                        }
                        ++curr_pos;
                }
@@ -2231,6 +2240,21 @@ int FFMPEG::scan_options(const char *options, AVDictionary *&opts, AVStream *st)
        return ret;
 }
 
+void FFMPEG::put_cache_frame(VFrame *frame, int64_t position)
+{
+       file_base->file->put_cache_frame(frame, position, 0);
+}
+
+int FFMPEG::get_use_cache()
+{
+       return file_base->file->get_use_cache();
+}
+
+void FFMPEG::purge_cache()
+{
+       file_base->file->purge_cache();
+}
+
 FFCodecRemap::FFCodecRemap()
 {
        old_codec = 0;