\r
if(c->codec_id == CODEC_ID_PRORES)\r
{ \r
- c->bit_rate = c->bit_rate > 0 ? c->bit_rate : format_desc_.width < 1280 ? 42*1000000 : 147*1000000;\r
+ c->bit_rate = format_desc_.width < 1280 ? 63*1000000 : 220*1000000;\r
c->pix_fmt = PIX_FMT_YUV422P10;\r
THROW_ON_ERROR2(av_set_options_string(c->priv_data, options.c_str(), "=", ":"), "[ffmpeg_consumer]");\r
}\r
if(format_desc_.width < 1280 || format_desc_.height < 720)\r
BOOST_THROW_EXCEPTION(caspar_exception() << msg_info("unsupported dimension"));\r
\r
- c->bit_rate = c->bit_rate > 0 ? c->bit_rate : 220*1000000;\r
+ c->bit_rate = 220*1000000;\r
c->pix_fmt = PIX_FMT_YUV422P;\r
\r
THROW_ON_ERROR2(av_set_options_string(c->priv_data, options.c_str(), "=", ":"), "[ffmpeg_consumer]");\r
}\r
else if(c->codec_id == CODEC_ID_DVVIDEO)\r
{\r
- c->bit_rate = c->bit_rate > 0 ? c->bit_rate : format_desc_.width < 1280 ? 50*1000000 : 100*1000000;\r
+ c->bit_rate = format_desc_.width < 1280 ? 50*1000000 : 100*1000000;\r
c->pix_fmt = PIX_FMT_YUV422P;\r
\r
+ c->width = format_desc_.height == 1280 ? 960 : c->width;\r
+\r
+ if(format_desc_.duration == 1001) \r
+ c->width = format_desc_.height == 1080 ? 1280 : c->width; \r
+ else\r
+ c->width = format_desc_.height == 1080 ? 1440 : c->width;\r
+ \r
THROW_ON_ERROR2(av_set_options_string(c->priv_data, options.c_str(), "=", ":"), "[ffmpeg_consumer]");\r
}\r
else if(c->codec_id == CODEC_ID_H264)\r
boost::filesystem::remove(boost::filesystem::wpath(env::media_folder() + params[1])); // Delete the file if it exists\r
bool key_only = std::find(params.begin(), params.end(), L"KEY_ONLY") != params.end();\r
\r
- std::string codec = "dnxhd";\r
+ std::string codec = "libx264";\r
auto codec_it = std::find(params.begin(), params.end(), L"CODEC");\r
if(codec_it != params.end() && codec_it++ != params.end())\r
codec = narrow(*codec_it);\r
\r
- if(codec == "H264" || codec == "h264")\r
+ if(codec == "H264")\r
codec = "libx264";\r
\r
+ if(codec == "DVCPRO")\r
+ codec = "dvvideo";\r
+\r
std::string options = "";\r
auto options_it = std::find(params.begin(), params.end(), L"OPTIONS");\r
if(options_it != params.end() && options_it++ != params.end())\r