\r
public:\r
\r
- stream()\r
- : index_(-1)\r
+ stream() : index_(-1)\r
{\r
buffer_.set_capacity(PACKET_BUFFER_COUNT);\r
}\r
-\r
+ \r
int open(std::shared_ptr<AVFormatContext>& fctx, AVMediaType media_type)\r
{ \r
const auto streams = boost::iterator_range<AVStream**>(fctx->streams, fctx->streams+fctx->nb_streams);\r
- const auto stream = boost::find_if(streams, [&](AVStream* stream) \r
+ const auto it = boost::find_if(streams, [&](AVStream* stream) \r
{\r
return stream && stream->codec->codec_type == media_type;\r
});\r
\r
- if(stream == streams.end()) \r
+ if(it == streams.end()) \r
return AVERROR_STREAM_NOT_FOUND;\r
\r
- auto codec = avcodec_find_decoder((*stream)->codec->codec_id); \r
+ auto codec = avcodec_find_decoder((*it)->codec->codec_id); \r
if(!codec)\r
return AVERROR_DECODER_NOT_FOUND;\r
\r
- index_ = (*stream)->index;\r
+ index_ = (*it)->index;\r
\r
- int errn = tbb_avcodec_open((*stream)->codec, codec);\r
- if(errn >= 0)\r
- {\r
- ctx_.reset((*stream)->codec, tbb_avcodec_close);\r
+ int errn = tbb_avcodec_open((*it)->codec, codec);\r
+ if(errn < 0)\r
+ return errn;\r
+ \r
+ ctx_.reset((*it)->codec, tbb_avcodec_close);\r
\r
- // Some files give an invalid time_base numerator, try to fix it.\r
- if(ctx_ && ctx_->time_base.num == 1)\r
- ctx_->time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(ctx_->time_base.den)))-1));\r
- }\r
+ // Some files give an invalid time_base numerator, try to fix it.\r
+ if(ctx_ && ctx_->time_base.num == 1)\r
+ ctx_->time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(ctx_->time_base.den)))-1));\r
+ \r
return errn; \r
}\r
\r
- std::shared_ptr<AVPacket> pop()\r
+ bool try_pop(std::shared_ptr<AVPacket>& pkt)\r
{\r
- std::shared_ptr<AVPacket> pkt;\r
- buffer_.try_pop(pkt);\r
- return pkt;\r
+ return buffer_.try_pop(pkt);\r
}\r
\r
void push(const std::shared_ptr<AVPacket>& pkt)\r
{\r
- if(pkt->stream_index != index_)\r
+ if(pkt && pkt->stream_index != index_)\r
+ return;\r
+\r
+ if(!ctx_)\r
return;\r
\r
- av_dup_packet(pkt.get());\r
+ if(pkt)\r
+ av_dup_packet(pkt.get());\r
+\r
buffer_.push(pkt); \r
}\r
\r
- const std::shared_ptr<AVCodecContext>& ctx() { return ctx_; }\r
+ int index() const {return index_;}\r
+ \r
+ const std::shared_ptr<AVCodecContext>& ctx() const { return ctx_; }\r
\r
operator bool(){return ctx_ != nullptr;}\r
\r
, filename_(filename)\r
, executor_(print())\r
, start_(std::max(start, 0))\r
- { \r
- graph_->set_color("input-buffer", diagnostics::color(1.0f, 1.0f, 0.0f));\r
- graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f)); \r
- \r
+ { \r
int errn;\r
\r
AVFormatContext* weak_format_context_ = nullptr;\r
\r
if(start_ != 0) \r
seek_frame(start_);\r
- \r
- executor_.start();\r
+\r
+ for(size_t n = 0; n < 32; ++n) // Read some packets for pre-rolling.\r
+ read_next_packet();\r
+ \r
+ if(audio_stream_)\r
+ graph_->set_color("audio-input-buffer", diagnostics::color(0.5f, 1.0f, 0.2f));\r
+ \r
+ if(video_stream_)\r
+ graph_->set_color("video-input-buffer", diagnostics::color(0.2f, 0.5f, 1.0f));\r
+ \r
+ graph_->set_color("seek", diagnostics::color(0.5f, 1.0f, 0.5f)); \r
+\r
executor_.begin_invoke([this]{read_file();});\r
CASPAR_LOG(info) << print() << " Started.";\r
}\r
~implementation()\r
{\r
stop();\r
+ // Unblock thread.\r
+ std::shared_ptr<AVPacket> packet;\r
+ try_pop_video_packet(packet);\r
+ try_pop_audio_packet(packet);\r
}\r
\r
- std::shared_ptr<AVPacket> get_video_packet()\r
+ bool try_pop_video_packet(std::shared_ptr<AVPacket>& packet)\r
{\r
- return video_stream_.pop();\r
+ bool result = video_stream_.try_pop(packet);\r
+ if(result && !packet)\r
+ graph_->add_tag("video-input-buffer");\r
+ return result;\r
}\r
\r
- std::shared_ptr<AVPacket> get_audio_packet()\r
- {\r
- return audio_stream_.pop();\r
+ bool try_pop_audio_packet(std::shared_ptr<AVPacket>& packet)\r
+ { \r
+ bool result = audio_stream_.try_pop(packet);\r
+ if(result && !packet)\r
+ graph_->add_tag("audio-input-buffer");\r
+ return result;\r
}\r
\r
- bool has_packet() const\r
- {\r
- return !video_stream_.empty() || !audio_stream_.empty();\r
- }\r
- \r
double fps()\r
{\r
return fps_;\r
void stop()\r
{\r
executor_.stop();\r
- get_video_packet();\r
- get_audio_packet();\r
+ \r
CASPAR_LOG(info) << print() << " Stopping.";\r
}\r
- \r
+\r
void read_file()\r
{ \r
- if(audio_stream_.size() > 4 && video_stream_.size() > 4)\r
- boost::this_thread::yield(); // There are enough packets, no hurry.\r
+ if(video_stream_.size() > 4 || audio_stream_.size() > 4) // audio is always before video.\r
+ Sleep(5); // There are enough packets, no hurry.\r
+\r
+ read_next_packet();\r
\r
+ executor_.begin_invoke([this]{read_file();});\r
+ }\r
+ \r
+ void read_next_packet()\r
+ { \r
try\r
{\r
- std::shared_ptr<AVPacket> read_packet(new AVPacket(), [](AVPacket* p)\r
+ std::shared_ptr<AVPacket> read_packet(new AVPacket, [](AVPacket* p)\r
{\r
av_free_packet(p);\r
delete p;\r
});\r
+ av_init_packet(read_packet.get());\r
\r
const int errn = av_read_frame(format_context_.get(), read_packet.get()); // read_packet is only valid until next call of av_read_frame.\r
if(is_eof(errn)) // Use av_dup_packet to extend its life.\r
{\r
seek_frame(start_, AVSEEK_FLAG_BACKWARD);\r
graph_->add_tag("seek"); \r
- CASPAR_LOG(info) << print() << " Received EOF. Looping."; \r
+ //CASPAR_LOG(info) << print() << " Received EOF. Looping."; \r
} \r
else\r
{\r
stop();\r
- CASPAR_LOG(info) << print() << " Received EOF. Stopping.";\r
+ //CASPAR_LOG(info) << print() << " Received EOF. Stopping.";\r
}\r
}\r
else if(errn < 0)\r
}\r
else\r
{\r
- video_stream_.push(read_packet);\r
- audio_stream_.push(read_packet);\r
- }\r
- \r
- graph_->update_value("input-buffer", static_cast<float>(std::max(video_stream_.size(), audio_stream_.size()))/static_cast<float>(PACKET_BUFFER_COUNT)); \r
+ if(video_stream_)\r
+ { \r
+ video_stream_.push(read_packet);\r
+ graph_->update_value("video-input-buffer", static_cast<float>(video_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT)); \r
+ }\r
+ if(audio_stream_)\r
+ { \r
+ audio_stream_.push(read_packet);\r
+ graph_->update_value("audio-input-buffer", static_cast<float>(audio_stream_.size())/static_cast<float>(PACKET_BUFFER_COUNT)); \r
+ }\r
+ } \r
}\r
catch(...)\r
{\r
stop();\r
CASPAR_LOG_CURRENT_EXCEPTION();\r
return;\r
- }\r
- \r
- executor_.begin_invoke([this]{read_file();}); \r
+ } \r
}\r
\r
void seek_frame(int64_t frame, int flags = 0)\r
{ \r
+ static const AVRational base_q = {1, AV_TIME_BASE};\r
+\r
// Convert from frames into seconds.\r
- const auto ts = frame*static_cast<int64_t>(AV_TIME_BASE/fps_);\r
+ auto seek_target = frame*static_cast<int64_t>(AV_TIME_BASE/fps_);\r
+\r
+ int stream_index = video_stream_.index() >= 0 ? video_stream_.index() : audio_stream_.index();\r
+\r
+ if(stream_index >= 0) \r
+ seek_target = av_rescale_q(seek_target, base_q, format_context_->streams[stream_index]->time_base);\r
\r
- const int errn = av_seek_frame(format_context_.get(), -1, ts, flags | AVSEEK_FLAG_FRAME);\r
+ const int errn = av_seek_frame(format_context_.get(), stream_index, seek_target, flags);\r
if(errn < 0)\r
{ \r
BOOST_THROW_EXCEPTION(\r
boost::errinfo_api_function("av_seek_frame") <<\r
boost::errinfo_errno(AVUNERROR(errn)));\r
}\r
+\r
+ video_stream_.push(nullptr);\r
+ audio_stream_.push(nullptr);\r
} \r
\r
bool is_eof(int errn)\r
{\r
- if(errn == AVERROR(EIO))\r
- CASPAR_LOG(warning) << print() << " Received EIO, assuming EOF";\r
+ //if(errn == AVERROR(EIO))\r
+ // CASPAR_LOG(warning) << print() << " Received EIO, assuming EOF";\r
\r
return errn == AVERROR_EOF || errn == AVERROR(EIO); // av_read_frame doesn't always correctly return AVERROR_EOF;\r
}\r
\r
std::wstring print() const\r
{\r
- return L"ffmpeg_input[" + filename_ + L"]";\r
+ const auto video = widen(video_stream_.ctx() ? video_stream_.ctx()->codec->name : "no-video");\r
+ const auto audio = widen(audio_stream_.ctx() ? audio_stream_.ctx()->codec->name : "no-audio");\r
+\r
+ return L"ffmpeg_input[" + filename_ + L"(" + boost::lexical_cast<std::wstring>(static_cast<int>(100*fps_)) + L"|" + video + L"|" + audio + L")]";\r
}\r
};\r
\r
-input::input(const safe_ptr<diagnostics::graph>& graph, const std::wstring& filename, bool loop, int start) \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
const std::shared_ptr<AVCodecContext>& input::get_video_codec_context() const{return impl_->video_stream_.ctx();}\r
const std::shared_ptr<AVCodecContext>& input::get_audio_codec_context() const{return impl_->audio_stream_.ctx();}\r
-bool input::has_packet() const{return impl_->has_packet();}\r
bool input::is_running() const {return impl_->executor_.is_running();}\r
-std::shared_ptr<AVPacket> input::get_video_packet(){return impl_->get_video_packet();}\r
-std::shared_ptr<AVPacket> input::get_audio_packet(){return impl_->get_audio_packet();}\r
+bool input::try_pop_video_packet(std::shared_ptr<AVPacket>& packet){return impl_->try_pop_video_packet(packet);}\r
+bool input::try_pop_audio_packet(std::shared_ptr<AVPacket>& packet){return impl_->try_pop_audio_packet(packet);}\r
double input::fps() const { return impl_->fps(); }\r
}
\ No newline at end of file
projects / casparcg / blobdiff