\r
#include "util.h"\r
\r
+#include "format/flv.h"\r
+\r
#include <tbb/concurrent_unordered_map.h>\r
#include <tbb/concurrent_queue.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
#include <core/producer/frame_producer.h>\r
#include <core/mixer/write_frame.h>\r
\r
#include <tbb/parallel_for.h>\r
\r
+#include <boost/filesystem.hpp>\r
+#include <boost/lexical_cast.hpp>\r
+\r
#if defined(_MSC_VER)\r
#pragma warning (push)\r
#pragma warning (disable : 4244)\r
{\r
#include <libswscale/swscale.h>\r
#include <libavcodec/avcodec.h>\r
+ #include <libavformat/avformat.h>\r
}\r
#if defined(_MSC_VER)\r
#pragma warning (pop)\r
#endif\r
\r
-namespace caspar {\r
+namespace caspar { namespace ffmpeg {\r
\r
-core::video_mode::type get_mode(AVFrame& frame)\r
+core::field_mode::type get_mode(AVFrame& frame)\r
{\r
if(!frame.interlaced_frame)\r
- return core::video_mode::progressive;\r
+ return core::field_mode::progressive;\r
\r
- return frame.top_field_first ? core::video_mode::upper : core::video_mode::lower;\r
+ return frame.top_field_first ? core::field_mode::upper : core::field_mode::lower;\r
}\r
\r
core::pixel_format::type get_pixel_format(PixelFormat pix_fmt)\r
{\r
auto pix_fmt = static_cast<PixelFormat>(decoded_frame->format);\r
\r
- auto write = frame_factory->create_frame(tag, desc.pix_fmt != core::pixel_format::invalid ? desc : get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
+ auto write = frame_factory->create_frame(tag, get_pixel_format_desc(PIX_FMT_BGRA, width, height));\r
write->set_type(get_mode(*decoded_frame));\r
\r
std::shared_ptr<SwsContext> sws_context;\r
\r
write->commit(n);\r
}\r
+ \r
+ return write;\r
+ }\r
+}\r
+\r
+bool is_sane_fps(AVRational time_base)\r
+{\r
+ double fps = static_cast<double>(time_base.den) / static_cast<double>(time_base.num);\r
+ return fps > 20.0 && fps < 65.0;\r
+}\r
\r
- //for(int n = 0; n < static_cast<int>(desc.planes.size()); ++n)\r
- //{\r
- // auto plane = desc.planes[n];\r
- // auto result = write->image_data(n).begin();\r
- // auto decoded = decoded_frame->data[n];\r
- // auto decoded_linesize = decoded_frame->linesize[n];\r
- // \r
- // for(size_t y = 0; y < static_cast<int>(desc.planes[n].height); ++y)\r
- // fast_memcpy(result + y*plane.linesize, decoded + y*decoded_linesize, plane.linesize);\r
+void fix_meta_data(AVFormatContext& context)\r
+{\r
+ auto video_index = av_find_best_stream(&context, AVMEDIA_TYPE_VIDEO, -1, -1, 0, 0);\r
+ auto audio_index = av_find_best_stream(&context, AVMEDIA_TYPE_AUDIO, -1, -1, 0, 0);\r
\r
- // write->commit(n);\r
- //}\r
+ if(video_index < 0)\r
+ return;\r
\r
- return write;\r
+ auto& video_context = *context.streams[video_index]->codec;\r
+ auto& video_stream = *context.streams[video_index];\r
+ \r
+ if(boost::filesystem2::path(context.filename).extension() == ".flv")\r
+ {\r
+ try\r
+ {\r
+ auto meta = read_flv_meta_info(context.filename);\r
+ double fps = boost::lexical_cast<double>(meta["framerate"]);\r
+ video_context.time_base.num = 1000000;\r
+ video_context.time_base.den = static_cast<int>(fps*1000000.0);\r
+ video_stream.nb_frames = static_cast<int64_t>(boost::lexical_cast<double>(meta["duration"])*fps);\r
+ }\r
+ catch(...){}\r
}\r
+ else\r
+ {\r
+ if(video_stream.nb_frames == 0)\r
+ video_stream.nb_frames = video_stream.duration;\r
+\r
+ if(!is_sane_fps(video_context.time_base))\r
+ { \r
+ if(video_context.time_base.num == 1)\r
+ video_context.time_base.num = static_cast<int>(std::pow(10.0, static_cast<int>(std::log10(static_cast<float>(video_context.time_base.den)))-1)); \r
+\r
+ if(!is_sane_fps(video_context.time_base) && audio_index > -1)\r
+ {\r
+ auto& audio_context = *context.streams[audio_index]->codec;\r
+ auto& audio_stream = *context.streams[audio_index];\r
+\r
+ double duration_sec = audio_stream.duration / static_cast<double>(audio_context.sample_rate);\r
+ \r
+ video_context.time_base.num = static_cast<int>(duration_sec*100000.0);\r
+ video_context.time_base.den = static_cast<int>(video_stream.nb_frames*100000);\r
+ }\r
+ }\r
+\r
+ if(audio_index > -1) // Check for invalid double frame-rate\r
+ {\r
+ auto& audio_context = *context.streams[audio_index]->codec;\r
+ auto& audio_stream = *context.streams[audio_index];\r
+\r
+ double duration_sec = audio_stream.duration / static_cast<double>(audio_context.sample_rate);\r
+ double fps = static_cast<double>(video_context.time_base.den) / static_cast<double>(video_context.time_base.num);\r
+\r
+ double fps_nb_frames = static_cast<double>(duration_sec*fps);\r
+ double stream_nb_frames = static_cast<double>(video_stream.nb_frames);\r
+ double diff = std::abs(fps_nb_frames - stream_nb_frames*2.0);\r
+ if(diff < fps_nb_frames*0.05)\r
+ video_context.time_base.num *= 2;\r
+ }\r
+ }\r
+\r
+ double fps = static_cast<double>(video_context.time_base.den) / static_cast<double>(video_context.time_base.num);\r
+\r
+ double closest_fps = 0.0;\r
+ for(int n = 0; n < core::video_format::count; ++n)\r
+ {\r
+ auto format = core::video_format_desc::get(static_cast<core::video_format::type>(n));\r
+\r
+ double diff1 = std::abs(format.fps - fps);\r
+ double diff2 = std::abs(closest_fps - fps);\r
+\r
+ if(diff1 < diff2)\r
+ closest_fps = format.fps;\r
+ }\r
+ \r
+ video_context.time_base.num = 1000000;\r
+ video_context.time_base.den = static_cast<int>(closest_fps*1000000.0);\r
}\r
\r
-}
\ No newline at end of file
+}}
\ No newline at end of file
projects / casparcg / blobdiff