#pragma warning (pop)\r
#endif\r
\r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
\r
-static const size_t MAX_BUFFER_COUNT = 128;\r
-static const size_t MAX_BUFFER_SIZE = 32 * 1000000;\r
+static const size_t MAX_BUFFER_COUNT = 100;\r
+static const size_t MIN_BUFFER_COUNT = 4;\r
+static const size_t MAX_BUFFER_SIZE = 16 * 1000000;\r
\r
struct input::implementation : boost::noncopyable\r
{ \r
\r
const std::wstring filename_;\r
const bool loop_;\r
- const int start_; \r
+ const size_t start_; \r
+ const size_t length_;\r
+ size_t frame_number_;\r
\r
tbb::concurrent_bounded_queue<std::shared_ptr<AVPacket>> buffer_;\r
tbb::atomic<size_t> buffer_size_;\r
tbb::atomic<size_t> nb_loops_;\r
\r
public:\r
- explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int start) \r
+ explicit implementation(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, size_t start, size_t length) \r
: graph_(graph)\r
, loop_(loop)\r
, filename_(filename)\r
- , start_(std::max(start, 0))\r
+ , start_(start)\r
+ , length_(length)\r
+ , frame_number_(0)\r
{ \r
is_running_ = true;\r
nb_frames_ = 0;\r
\r
format_context_.reset(weak_format_context_, av_close_input_file);\r
\r
- //av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0);\r
+ av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0);\r
\r
THROW_ON_ERROR2(avformat_find_stream_info(format_context_.get(), nullptr), print());\r
\r
default_stream_index_ = THROW_ON_ERROR2(av_find_default_stream_index(format_context_.get()), print());\r
\r
- if(start_ != 0) \r
+ if(start_ > 0) \r
seek_frame(start_);\r
\r
for(int n = 0; n < 16 && !full(); ++n)\r
read_next_packet();\r
\r
- graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f)); \r
- graph_->set_color("buffer-count", diagnostics::color(0.2f, 0.8f, 1.0f));\r
- graph_->set_color("buffer-size", diagnostics::color(0.2f, 0.4f, 1.0f)); \r
+ graph_->set_color("seek", diagnostics::color(1.0f, 0.5f, 0.0f)); \r
+ graph_->set_color("buffer-count", diagnostics::color(0.7f, 0.4f, 0.4f));\r
+ graph_->set_color("buffer-size", diagnostics::color(1.0f, 1.0f, 0.0f)); \r
\r
thread_ = boost::thread([this]{run();});\r
}\r
buffer_cond_.notify_all();\r
}\r
\r
- graph_->update_value("buffer-size", MAX_BUFFER_SIZE/static_cast<double>(buffer_size_));\r
- graph_->update_value("buffer-count", MAX_BUFFER_SIZE/static_cast<double>(buffer_.size()));\r
+ graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+ graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
\r
return result;\r
}\r
{\r
{\r
boost::unique_lock<boost::mutex> lock(buffer_mutex_);\r
- buffer_cond_.wait(lock, [this]{return !full();});\r
+ while(full())\r
+ buffer_cond_.timed_wait(lock, boost::posix_time::millisec(20));\r
}\r
read_next_packet(); \r
}\r
if(is_eof(ret)) \r
{\r
++nb_loops_;\r
+ frame_number_ = 0;\r
\r
if(loop_)\r
{\r
- seek_frame(start_, AVSEEK_FLAG_BACKWARD);\r
+ int flags = AVSEEK_FLAG_BACKWARD;\r
+\r
+ int vid_stream_index = av_find_best_stream(format_context_.get(), AVMEDIA_TYPE_VIDEO, -1, -1, 0, 0);\r
+ if(vid_stream_index >= 0)\r
+ {\r
+ auto codec_id = format_context_->streams[vid_stream_index]->codec->codec_id;\r
+ if(codec_id == CODEC_ID_VP6A || codec_id == CODEC_ID_VP6F || codec_id == CODEC_ID_VP6)\r
+ flags |= AVSEEK_FLAG_BYTE;\r
+ }\r
+\r
+ seek_frame(start_, flags);\r
graph_->add_tag("seek"); \r
- CASPAR_LOG(trace) << print() << " Received EOF. Looping."; \r
+ CASPAR_LOG(trace) << print() << " Looping."; \r
} \r
else\r
{\r
is_running_ = false;\r
- CASPAR_LOG(trace) << print() << " Received EOF. Stopping.";\r
+ CASPAR_LOG(trace) << print() << " Stopping.";\r
}\r
}\r
else\r
{ \r
THROW_ON_ERROR(ret, print(), "av_read_frame");\r
\r
- if(read_packet->stream_index == default_stream_index_ && nb_loops_ == 0)\r
- ++nb_frames_;\r
+ if(read_packet->stream_index == default_stream_index_)\r
+ {\r
+ if(nb_loops_ == 0)\r
+ ++nb_frames_;\r
+ ++frame_number_;\r
+ }\r
\r
THROW_ON_ERROR2(av_dup_packet(read_packet.get()), print());\r
\r
buffer_.try_push(read_packet);\r
buffer_size_ += read_packet->size;\r
\r
- graph_->update_value("buffer-count", MAX_BUFFER_SIZE/static_cast<double>(buffer_.size()));\r
- graph_->update_value("buffer-size", MAX_BUFFER_SIZE/static_cast<double>(buffer_size_));\r
+ graph_->update_value("buffer-size", (static_cast<double>(buffer_size_)+0.001)/MAX_BUFFER_SIZE);\r
+ graph_->update_value("buffer-count", (static_cast<double>(buffer_.size()+0.001)/MAX_BUFFER_COUNT));\r
} \r
}\r
\r
bool full() const\r
{\r
- return is_running_ && (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT);\r
+ return is_running_ && (buffer_size_ > MAX_BUFFER_SIZE || buffer_.size() > MAX_BUFFER_COUNT) && buffer_.size() > MIN_BUFFER_COUNT;\r
}\r
\r
void seek_frame(int64_t frame, int flags = 0)\r
bool is_eof(int ret)\r
{\r
if(ret == AVERROR(EIO))\r
- CASPAR_LOG(debug) << print() << " Received EIO, assuming EOF. " << nb_frames_;\r
+ CASPAR_LOG(trace) << print() << " Received EIO, assuming EOF. " << nb_frames_;\r
if(ret == AVERROR_EOF)\r
- CASPAR_LOG(info) << print() << " Received EOF. " << nb_frames_;\r
+ CASPAR_LOG(trace) << print() << " Received EOF. " << nb_frames_;\r
\r
- return nb_frames_ > 0 && (ret == AVERROR_EOF || ret == AVERROR(EIO)); // av_read_frame doesn't always correctly return AVERROR_EOF;\r
+ return ret == AVERROR_EOF || ret == AVERROR(EIO) || frame_number_ >= length_; // av_read_frame doesn't always correctly return AVERROR_EOF;\r
}\r
\r
std::wstring print() const\r
}\r
};\r
\r
-input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int start, int length) \r
- : impl_(new implementation(graph, filename, loop, start)){}\r
+input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, size_t start, size_t length) \r
+ : impl_(new implementation(graph, filename, loop, start, length)){}\r
bool input::eof() const {return !impl_->is_running_;}\r
bool input::try_pop(std::shared_ptr<AVPacket>& packet){return impl_->try_pop(packet);}\r
safe_ptr<AVFormatContext> input::context(){return make_safe(impl_->format_context_);}\r
size_t input::nb_frames() const {return impl_->nb_frames();}\r
size_t input::nb_loops() const {return impl_->nb_loops();}\r
-}
\ No newline at end of file
+}}
\ No newline at end of file
projects / casparcg / blobdiff