#include "../../ffmpeg_error.h"\r
#include "../../tbb_avcodec.h"\r
\r
-#include <core/producer/frame/image_transform.h>\r
+#include <core/producer/frame/frame_transform.h>\r
#include <core/producer/frame/frame_factory.h>\r
\r
#include <boost/range/algorithm_ext/push_back.hpp>\r
+#include <boost/filesystem.hpp>\r
\r
#include <queue>\r
\r
#pragma warning (pop)\r
#endif\r
\r
-namespace caspar {\r
- \r
+namespace caspar { namespace ffmpeg {\r
+ \r
struct video_decoder::implementation : boost::noncopyable\r
{\r
const safe_ptr<core::frame_factory> frame_factory_;\r
\r
double fps_;\r
int64_t nb_frames_;\r
+\r
+ size_t width_;\r
+ size_t height_;\r
+\r
public:\r
- explicit implementation(const s
td::shared_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)
\r+ explicit implementation(const s
afe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter)
\r : frame_factory_(frame_factory)\r
, filter_(filter)\r
, fps_(frame_factory_->get_video_format_desc().fps)\r
, nb_frames_(0)\r
+ , width_(0)\r
+ , height_(0)\r
{\r
try\r
{\r
\r
codec_context_.reset(context->streams[index_]->codec, tbb_avcodec_close);\r
\r
+ CASPAR_LOG(debug) << "[video_decoder] " << context->streams[index_]->codec->codec->long_name;\r
+\r
// Some files give an invalid time_base numerator, try to fix it.\r
- if(codec_context_ && codec_context_->time_base.num == 1)\r
- codec_context_->time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(codec_context_->time_base.den)))-1)); \r
- \r
- nb_frames_ = context->streams[index_]->nb_frames;\r
- if(nb_frames_ == 0)\r
- nb_frames_ = context->streams[index_]->duration;// * context->streams[index_]->time_base.den;\r
\r
+ fix_meta_data(*context);\r
+ \r
fps_ = static_cast<double>(codec_context_->time_base.den) / static_cast<double>(codec_context_->time_base.num);\r
+ nb_frames_ = context->streams[index_]->nb_frames;\r
+\r
if(double_rate(filter))\r
fps_ *= 2;\r
+\r
+ width_ = codec_context_->width;\r
+ height_ = codec_context_->height;\r
}\r
catch(...)\r
{\r
\r
std::vector<std::shared_ptr<AVFrame>> poll()\r
{ \r
+ std::vector<std::shared_ptr<AVFrame>> result;\r
+\r
+ if(packets_.empty())\r
+ return result;\r
+\r
if(!codec_context_)\r
return empty_poll();\r
\r
- std::vector<std::shared_ptr<AVFrame>> result;\r
-\r
- while(!packets_.empty() && result.empty())\r
- {\r
- auto packet = packets_.front();\r
+ auto packet = packets_.front();\r
\r
- if(packet)\r
- {\r
- auto frame = decode(*packet);\r
+ if(packet)\r
+ { \r
+ BOOST_FOREACH(auto& frame, decode(*packet))\r
boost::range::push_back(result, filter_.execute(frame));\r
- if(packet->size == 0)\r
- packets_.pop();\r
- }\r
- else\r
+\r
+ if(packet->size == 0)\r
+ packets_.pop();\r
+ }\r
+ else\r
+ {\r
+ if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
{\r
- if(codec_context_->codec->capabilities & CODEC_CAP_DELAY)\r
- {\r
- AVPacket pkt;\r
- av_init_packet(&pkt);\r
- pkt.data = nullptr;\r
- pkt.size = 0;\r
- auto frame = decode(pkt);\r
+ AVPacket pkt;\r
+ av_init_packet(&pkt);\r
+ pkt.data = nullptr;\r
+ pkt.size = 0;\r
+\r
+ BOOST_FOREACH(auto& frame, decode(pkt))\r
boost::range::push_back(result, filter_.execute(frame)); \r
- }\r
-\r
- if(result.empty())\r
- { \r
- packets_.pop();\r
- avcodec_flush_buffers(codec_context_.get());\r
- result.push_back(nullptr);\r
- }\r
+ }\r
+\r
+ if(result.empty())\r
+ { \r
+ packets_.pop();\r
+ avcodec_flush_buffers(codec_context_.get());\r
+ result.push_back(nullptr);\r
}\r
}\r
\r
}\r
\r
std::vector<std::shared_ptr<AVFrame>> empty_poll()\r
- { \r
- if(packets_.empty())\r
- return std::vector<std::shared_ptr<AVFrame>>();\r
- \r
+ { \r
auto packet = packets_.front();\r
packets_.pop();\r
\r
return boost::assign::list_of(frame); \r
}\r
\r
- std::shared_ptr<AVFrame> decode(AVPacket& pkt)\r
+ std::vector<std::shared_ptr<AVFrame>> decode(AVPacket& pkt)\r
{\r
std::shared_ptr<AVFrame> decoded_frame(avcodec_alloc_frame(), av_free);\r
\r
pkt.data = nullptr;\r
pkt.size = 0;\r
\r
- if(frame_finished != 0) \r
- {\r
- if(decoded_frame->repeat_pict != 0)\r
- CASPAR_LOG(warning) << "video_decoder: repeat_pict not implemented.";\r
- return decoded_frame;\r
- }\r
+ if(frame_finished == 0) \r
+ return std::vector<std::shared_ptr<AVFrame>>();\r
\r
- return nullptr;\r
+ if(decoded_frame->repeat_pict % 2 > 0)\r
+ CASPAR_LOG(warning) << "[video_decoder]: Field repeat_pict not implemented.";\r
+ \r
+ return std::vector<std::shared_ptr<AVFrame>>(1 + decoded_frame->repeat_pict/2, decoded_frame);\r
}\r
\r
bool ready() const\r
{\r
- return !codec_context_ || packets_.size() > 2;\r
+ return !packets_.empty();\r
}\r
\r
double fps() const\r
}\r
};\r
\r
-video_decoder::video_decoder(const s
td::shared_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) : impl_(new implementation(context, frame_factory, filter)){}
\r+video_decoder::video_decoder(const s
afe_ptr<AVFormatContext>& context, const safe_ptr<core::frame_factory>& frame_factory, const std::wstring& filter) : impl_(new implementation(context, frame_factory, filter)){}
\r void video_decoder::push(const std::shared_ptr<AVPacket>& packet){impl_->push(packet);}\r
std::vector<std::shared_ptr<AVFrame>> video_decoder::poll(){return impl_->poll();}\r
bool video_decoder::ready() const{return impl_->ready();}\r
double video_decoder::fps() const{return impl_->fps();}\r
int64_t video_decoder::nb_frames() const{return impl_->nb_frames_;}\r
-}
\ No newline at end of file
+size_t video_decoder::width() const{return impl_->width_;}\r
+size_t video_decoder::height() const{return impl_->height_;}\r
+\r
+}}
\ No newline at end of file
projects / casparcg / blobdiff