fix(ffmpeg_producer): revert seekable changes

Author: ronag

src/modules/ffmpeg/producer/av_producer.cpp

@@ -542,8 +542,7 @@ struct AVProducer::Impl
     std::string afilter_;
     std::string vfilter_;
 
-    boost::optional<bool> seekable_;
-
+    int              seekable_       = 2;
     int64_t          frame_count_    = 0;
     bool             frame_flush_    = true;
     int64_t          frame_time_     = AV_NOPTS_VALUE;
@@ -570,18 +569,19 @@ struct AVProducer::Impl
          boost::optional<int64_t>             start,
          boost::optional<int64_t>             duration,
          bool                                 loop,
-         boost::optional<bool>                seekable)
+         int                                  seekable)
         : frame_factory_(frame_factory)
         , format_desc_(format_desc)
         , format_tb_({format_desc.duration, format_desc.time_scale})
         , name_(name)
         , path_(path)
-        , input_(path, graph_, seekable)
+        , input_(path, graph_, seekable >= 0 && seekable < 2 ? boost::optional<bool>(false) : boost::optional<bool>())
         , start_(start ? av_rescale_q(*start, format_tb_, TIME_BASE_Q) : AV_NOPTS_VALUE)
         , duration_(duration ? av_rescale_q(*duration, format_tb_, TIME_BASE_Q) : AV_NOPTS_VALUE)
         , loop_(loop)
         , afilter_(afilter)
         , vfilter_(vfilter)
+        , seekable_(seekable)
     {
         diagnostics::register_graph(graph_);
         graph_->set_color("underflow", diagnostics::color(0.6f, 0.3f, 0.9f));
@@ -593,6 +593,8 @@ struct AVProducer::Impl
         state_["loop"]      = loop;
         update_state();
 
+        CASPAR_LOG(debug) << print() << " seekable: " << seekable_;
+
         thread_ = boost::thread([=] {
             try {
                 run();
@@ -994,10 +996,9 @@ struct AVProducer::Impl
         time = time + (input_->start_time != AV_NOPTS_VALUE ? input_->start_time : 0);
 
         // TODO (fix) Dont seek if time is close future.
-        if (!seekable_ || *seekable_) {
+        if (seekable_) {
             input_.seek(time);
         }
-
         frame_flush_ = true;
         frame_count_ = 0;
         buffer_eof_  = false;
@@ -1053,7 +1054,7 @@ AVProducer::AVProducer(std::shared_ptr<core::frame_factory> frame_factory,
                        boost::optional<int64_t>             start,
                        boost::optional<int64_t>             duration,
                        boost::optional<bool>                loop,
-                       boost::optional<bool>                seekable)
+                       int                                  seekable)
     : impl_(new Impl(std::move(frame_factory),
                      std::move(format_desc),
                      std::move(name),

src/modules/ffmpeg/producer/av_producer.h

@@ -23,7 +23,7 @@ class AVProducer
                boost::optional<int64_t>             start,
                boost::optional<int64_t>             duration,
                boost::optional<bool>                loop,
-               boost::optional<bool>                seekable);
+               int                                  seekable);
 
     core::draw_frame prev_frame();
     core::draw_frame next_frame();

src/modules/ffmpeg/producer/ffmpeg_producer.cpp

@@ -72,7 +72,7 @@ struct ffmpeg_producer : public core::frame_producer
                              boost::optional<int64_t>             start,
                              boost::optional<int64_t>             duration,
                              boost::optional<bool>                loop,
-                             boost::optional<bool>                seekable)
+                             int                                  seekable)
         : filename_(filename)
         , frame_factory_(frame_factory)
         , format_desc_(format_desc)
@@ -315,7 +315,7 @@ spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer
         return core::frame_producer::empty();
     }
 
-    auto seekable_opt = get_param(L"SEEKABLE", params, static_cast<int>(-1));
+    auto seekable = get_param(L"SEEKABLE", params, static_cast<int>(-1));
 
     auto loop = contains_param(L"LOOP", params);
 
@@ -346,16 +346,14 @@ spl::shared_ptr<core::frame_producer> create_producer(const core::frame_producer
         duration = out - in;
     }
 
-    boost::optional<bool> seekable;
-
     auto ext = boost::to_lower_copy(boost::filesystem::path(path).extension().wstring());
-    if (seekable_opt == -1) {
+    if (seekable == -1) {
       if ((!start || !*start) && ext == L".mxf") {
           // mxf does a lot of unecessary seeking for FooterPartition.
-          seekable = false;
+          seekable = 1;
+      } else {
+          seekable = 2;
       }
-    } else {
-        seekable = seekable_opt > 0;
     }
 
     // TODO (fix) use raw input?