]> git.sesse.net Git - casparcg/blobdiff - modules/ffmpeg/producer/input/input.cpp
2.0.2: - Updated get_param.
[casparcg] / modules / ffmpeg / producer / input / input.cpp
index f45dd67edc113ff3f4e03e56be72a09a56885dbc..ffa43eaddc1b247b93f73a3200431fc072808b8c 100644 (file)
@@ -70,8 +70,8 @@ struct input::implementation : boost::noncopyable
                        \r
        const std::wstring                                                                                      filename_;\r
        tbb::atomic<bool>                                                                                       loop_;\r
-       const size_t                                                                                            start_;         \r
-       const size_t                                                                                            length_;\r
+       const uint64_t                                                                                          start_;         \r
+       const uint64_t                                                                                          length_;\r
        size_t                                                                                                          frame_number_;\r
        \r
        tbb::concurrent_bounded_queue<std::shared_ptr<AVPacket>>        buffer_;\r
@@ -85,7 +85,7 @@ struct input::implementation : boost::noncopyable
 \r
        tbb::recursive_mutex                                                                            mutex_;\r
 \r
-       explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, size_t start, size_t length) \r
+       explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int64_t start, int64_t length) \r
                : graph_(graph)\r
                , format_context_(open_input(filename))         \r
                , default_stream_index_(av_find_default_stream_index(format_context_.get()))\r
@@ -178,7 +178,7 @@ struct input::implementation : boost::noncopyable
                        {\r
                                do_seek(start_);\r
                                graph_->add_tag("seek");                \r
-                               CASPAR_LOG(debug) << print() << " Looping.";                    \r
+                               CASPAR_LOG(trace) << print() << " Looping.";                    \r
                        }                                       \r
                }\r
                else\r
@@ -264,7 +264,7 @@ struct input::implementation : boost::noncopyable
                if(ret == AVERROR(EIO))\r
                        CASPAR_LOG(trace) << print() << " Received EIO, assuming EOF. ";\r
                if(ret == AVERROR_EOF)\r
-                       CASPAR_LOG(debug) << print() << " Received EOF. ";\r
+                       CASPAR_LOG(trace) << print() << " Received EOF. ";\r
 \r
                return ret == AVERROR_EOF || ret == AVERROR(EIO) || frame_number_ >= length_; // av_read_frame doesn't always correctly return AVERROR_EOF;\r
        }\r
@@ -275,7 +275,7 @@ struct input::implementation : boost::noncopyable
        }\r
 };\r
 \r
-input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, size_t start, size_t length) \r
+input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int64_t start, int64_t length) \r
        : impl_(new implementation(graph, filename, loop, start, length)){}\r
 bool input::eof() const {return impl_->is_eof_;}\r
 bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r