/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
+* Copyright 2013 Sveriges Television AB http://casparcg.com/\r
*\r
* This file is part of CasparCG (www.casparcg.com).\r
*\r
#include <core/producer/frame/frame_factory.h>\r
#include <core/producer/frame_producer.h>\r
#include <core/mixer/write_frame.h>\r
+#include <core/mixer/audio/audio_util.h>\r
\r
#include <common/exception/exceptions.h>\r
#include <common/utility/assert.h>\r
\r
#include <boost/filesystem.hpp>\r
#include <boost/lexical_cast.hpp>\r
+#include <boost/algorithm/string.hpp>\r
\r
#if defined(_MSC_VER)\r
#pragma warning (push)\r
}\r
}\r
\r
-safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints)\r
+safe_ptr<core::write_frame> make_write_frame(const void* tag, const safe_ptr<AVFrame>& decoded_frame, const safe_ptr<core::frame_factory>& frame_factory, int hints, const core::channel_layout& audio_channel_layout)\r
{ \r
static tbb::concurrent_unordered_map<int64_t, tbb::concurrent_queue<std::shared_ptr<SwsContext>>> sws_contexts_;\r
\r
if(decoded_frame->width < 1 || decoded_frame->height < 1)\r
- return make_safe<core::write_frame>(tag);\r
+ return make_safe<core::write_frame>(tag, audio_channel_layout);\r
\r
const auto width = decoded_frame->width;\r
const auto height = decoded_frame->height;\r
\r
auto target_desc = get_pixel_format_desc(target_pix_fmt, width, height);\r
\r
- write = frame_factory->create_frame(tag, target_desc);\r
+ write = frame_factory->create_frame(tag, target_desc, audio_channel_layout);\r
write->set_type(get_mode(*decoded_frame));\r
\r
std::shared_ptr<SwsContext> sws_context;\r
}\r
else\r
{\r
- write = frame_factory->create_frame(tag, desc);\r
+ write = frame_factory->create_frame(tag, desc, audio_channel_layout);\r
write->set_type(get_mode(*decoded_frame));\r
\r
for(int n = 0; n < static_cast<int>(desc.planes.size()); ++n)\r
CASPAR_ASSERT(decoded);\r
CASPAR_ASSERT(write->image_data(n).begin());\r
\r
- if(decoded_linesize != static_cast<int>(plane.width))\r
+ if(decoded_linesize != static_cast<int>(plane.linesize))\r
{\r
// Copy line by line since ffmpeg sometimes pads each line.\r
tbb::parallel_for<size_t>(0, desc.planes[n].height, [&](size_t y)\r
{\r
const auto video_context = context.streams[video_index]->codec;\r
const auto video_stream = context.streams[video_index];\r
- \r
+ \r
+ auto frame_rate_time_base = video_stream->avg_frame_rate;\r
+ std::swap(frame_rate_time_base.num, frame_rate_time_base.den);\r
+\r
+ if(is_sane_fps(frame_rate_time_base))\r
+ {\r
+ return static_cast<double>(frame_rate_time_base.den) / static_cast<double>(frame_rate_time_base.num);\r
+ }\r
+\r
AVRational time_base = video_context->time_base;\r
\r
if(boost::filesystem2::path(context.filename).extension() == ".flv")\r
return fail_value; \r
}\r
\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
-\r
- if(video_index > -1)\r
- {\r
- auto video_stream = context.streams[video_index];\r
- auto video_context = context.streams[video_index]->codec;\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_stream->nb_frames = static_cast<int64_t>(boost::lexical_cast<double>(meta["duration"])*fps);\r
- }\r
- catch(...){}\r
- }\r
- else\r
- {\r
- auto stream_time = video_stream->time_base;\r
- auto duration = video_stream->duration;\r
- auto codec_time = video_context->time_base;\r
- auto ticks = video_context->ticks_per_frame;\r
-\r
- if(video_stream->nb_frames == 0)\r
- video_stream->nb_frames = (duration*stream_time.num*codec_time.den)/(stream_time.den*codec_time.num*ticks); \r
- }\r
- }\r
-}\r
-\r
safe_ptr<AVPacket> create_packet()\r
{\r
safe_ptr<AVPacket> packet(new AVPacket, [](AVPacket* p)\r
return safe_ptr<AVCodecContext>(context.streams[index]->codec, tbb_avcodec_close);\r
}\r
\r
-safe_ptr<AVFormatContext> open_input(const std::wstring& filename)\r
-{\r
- AVFormatContext* weak_context = nullptr;\r
- THROW_ON_ERROR2(avformat_open_input(&weak_context, narrow(filename).c_str(), nullptr, nullptr), filename);\r
- safe_ptr<AVFormatContext> context(weak_context, av_close_input_file); \r
- THROW_ON_ERROR2(avformat_find_stream_info(weak_context, nullptr), filename);\r
- fix_meta_data(*context);\r
- return context;\r
-}\r
-\r
std::wstring print_mode(size_t width, size_t height, double fps, bool interlaced)\r
{\r
std::wostringstream fps_ss;\r
return boost::lexical_cast<std::wstring>(width) + L"x" + boost::lexical_cast<std::wstring>(height) + (!interlaced ? L"p" : L"i") + fps_ss.str();\r
}\r
\r
-bool is_valid_file(const std::wstring filename)\r
-{ \r
+bool is_valid_file(const std::wstring filename, const std::vector<std::wstring>& invalid_exts)\r
+{\r
+ static std::vector<std::wstring> valid_exts = boost::assign::list_of(L".m2t")(L".mov")(L".mp4")(L".dv")(L".flv")(L".mpg")(L".wav")(L".mp3")(L".dnxhd")(L".h264")(L".prores");\r
+\r
+ auto ext = boost::to_lower_copy(boost::filesystem::wpath(filename).extension());\r
+ \r
+ if(std::find(invalid_exts.begin(), invalid_exts.end(), ext) != invalid_exts.end())\r
+ return false; \r
+\r
+ if(std::find(valid_exts.begin(), valid_exts.end(), ext) != valid_exts.end())\r
+ return true; \r
+\r
auto filename2 = narrow(filename);\r
\r
if(boost::filesystem::path(filename2).extension() == ".m2t")\r
return av_probe_input_format2(&pb, true, &score) != nullptr;\r
}\r
\r
+bool is_valid_file(const std::wstring filename)\r
+{\r
+ static const std::vector<std::wstring> invalid_exts = boost::assign::list_of(L".png")(L".tga")(L".bmp")(L".jpg")(L".jpeg")(L".gif")(L".tiff")(L".tif")(L".jp2")(L".jpx")(L".j2k")(L".j2c")(L".swf")(L".ct");\r
+ \r
+ return is_valid_file(filename, invalid_exts);\r
+}\r
+\r
+bool try_get_duration(const std::wstring filename, std::int64_t& duration, boost::rational<std::int64_t>& time_base)\r
+{ \r
+ AVFormatContext* weak_context = nullptr;\r
+ if(avformat_open_input(&weak_context, narrow(filename).c_str(), nullptr, nullptr) < 0)\r
+ return false;\r
+\r
+ std::shared_ptr<AVFormatContext> context(weak_context, av_close_input_file);\r
+ \r
+ context->probesize = context->probesize / 10;\r
+ context->max_analyze_duration = context->probesize / 10;\r
+\r
+ if(avformat_find_stream_info(context.get(), nullptr) < 0)\r
+ return false;\r
+\r
+ const auto fps = read_fps(*context, 1.0);\r
+ \r
+ const auto rational_fps = boost::rational<std::int64_t>(static_cast<int>(fps * AV_TIME_BASE), AV_TIME_BASE);\r
+ \r
+ duration = boost::rational_cast<std::int64_t>(context->duration * rational_fps / AV_TIME_BASE);\r
+\r
+ if (rational_fps == 0)\r
+ return false;\r
+\r
+ time_base = 1/rational_fps;\r
+\r
+ return true;\r
+}\r
+\r
+std::wstring probe_stem(const std::wstring stem, const std::vector<std::wstring>& invalid_exts)\r
+{\r
+ auto stem2 = boost::filesystem2::wpath(stem);\r
+ auto dir = stem2.parent_path();\r
+ for(auto it = boost::filesystem2::wdirectory_iterator(dir); it != boost::filesystem2::wdirectory_iterator(); ++it)\r
+ {\r
+ if(boost::iequals(it->path().stem(), stem2.filename()) && is_valid_file(it->path().file_string(), invalid_exts))\r
+ return it->path().file_string();\r
+ }\r
+ return L"";\r
+}\r
+\r
std::wstring probe_stem(const std::wstring stem)\r
{\r
auto stem2 = boost::filesystem2::wpath(stem);\r
}\r
return L"";\r
}\r
+\r
+core::channel_layout get_audio_channel_layout(\r
+ const AVCodecContext& context, const std::wstring& custom_channel_order)\r
+{\r
+ if (!custom_channel_order.empty())\r
+ {\r
+ auto layout = core::create_custom_channel_layout(\r
+ custom_channel_order,\r
+ core::default_channel_layout_repository());\r
+\r
+ layout.num_channels = context.channels;\r
+\r
+ return layout;\r
+ }\r
+\r
+ int64_t ch_layout = context.channel_layout;\r
+\r
+ if (ch_layout == 0)\r
+ ch_layout = av_get_default_channel_layout(context.channels);\r
+\r
+ switch (ch_layout) // TODO: refine this auto-detection\r
+ {\r
+ case AV_CH_LAYOUT_MONO:\r
+ return core::default_channel_layout_repository().get_by_name(L"MONO");\r
+ case AV_CH_LAYOUT_STEREO:\r
+ return core::default_channel_layout_repository().get_by_name(L"STEREO");\r
+ case AV_CH_LAYOUT_5POINT1:\r
+ case AV_CH_LAYOUT_5POINT1_BACK:\r
+ return core::default_channel_layout_repository().get_by_name(L"SMPTE");\r
+ case AV_CH_LAYOUT_7POINT1:\r
+ return core::default_channel_layout_repository().get_by_name(L"DOLBYE");\r
+ }\r
+\r
+ return core::create_unspecified_layout(context.channels);\r
+}\r
+\r
//\r
//void av_dup_frame(AVFrame* frame)\r
//{\r
projects / casparcg / blobdiff